Jeremy
Merge branch 'master' of https://github.com/rehfeldchris/cs160proj

Conflicts:
	index.php
Merge branch 'master' of https://github.com/rehfeldchris/cs160proj