Organized files
Merge branch 'master' of https://github.com/jeriluma/Info-343-Group-Project

Conflicts:
	shop.html