Updated github structure

Cleaned up the file structure.
Merge branch 'master' of https://github.com/mfleming7024/GamersCafe

Conflicts:
	Controllers for gamers cafe/.DS_Store