updated merge
Merge branch 'master' of https://github.com/mfleming7024/GamersCafe

Conflicts:
	gamerscafe_final/controllers/core.js