Forced Commits

it's making me do this...
Merge branch 'master' of https://github.com/ShaolinShadowCoders/PokerApp

Conflicts:
	.DS_Store