mr page
Merge branch 'master' of https://github.com/UT-IDEAL/lab-website

Conflicts:
	projects/.DS_Store