merge
Added some html boilerplate nav bar code to certain pages
merge
Merge branch 'master' of https://github.com/hspinks/cs108