Files updated from the ftp push
Merge branch 'master' of https://github.com/sethicis/cs405G_StoreFront

Conflicts:
	index.php