End of first sprint deliverables
Mergin new stuff
Merge branch 'master' of https://github.com/bradjohns94/Card-App---Android

Conflicts:
	YourDeal/AndroidManifest.xml
	YourDeal/src/com/example/digitalDeck/CreateGameActivity.java
	YourDeal/src/com/example/digitalDeck/FindGameActivity.java