projects page changed
Merge branch 'gh-pages' into research_page_edit

Conflicts:
	research.md
fixing stuff
changes made to about.html
Merge branch 'gh-pages' of github.com:modilabs/modilabs-site into gh-pages