Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
5/28 added javascript, navbar fixing
Merge branch 'gh-pages'
5/28 end of class -- navbar and photo fixes