merging with mike and chris for fix with gts
Merge branch 'master' of https://github.com/mfleming7024/GamersCafe

Conflicts:
	gamerscafe_final/views/templates/home.html