pull to get .idea off
Merge branch 'master' of https://github.com/mfleming7024/GamersCafe

Conflicts:
	.idea/workspace.xml
prepping the master to merge with Chris update