Merge branch 'master' of https://github.com/GregKoestler/311-Project

Conflicts:
	index.php
Fixing stupd commit error