scotty 2253dc61bd Merge remote-tracking branch 'origin/master' ... # Conflicts: # .DS_Store # css/styles.css		2016-02-10 08:47:25 -08:00
..
.DS_Store	adding TOC logic	2016-02-09 11:56:38 -08:00
docwithnav.html	Merge remote-tracking branch 'origin/master'	2016-02-10 08:47:25 -08:00
headerfooter.html	First pass at layout creation	2016-02-08 18:28:54 -08:00