Merge branch 'gh-pages'
5/28 end of class -- navbar and photo fixes
Merge branch 'master' into gh-pages
6/2 start of class (page adds and page changes)
Merge branch 'master' into gh-pages