Testing git ignore configuration
Merge branch 'DEllis'

Conflicts:
	HotPotato/res/values/strings.xml
Removed generated files in HotPotato
Removed generated files in appcompat
added .gitignore
Hello World
Added Git Ignore file
Removed test.txt from Git Ignore
Committing so I can pull...
BHoward added .gitignore
foo
Merge remote-tracking branch 'origin/BHoward'
Implemented CreateGameActivity
Moved WiFi P2P to CreateGameActivity
Added Kill Kill Kill banner image
Merge branch 'DEllis' of https://github.com/bharris057/potato

Conflicts:
	HotPotato/res/layout/main_screen.xml
	HotPotato/res/values/strings.xml
Fixed some layout stuff on Main Screen
Added .gitignore
Merge branch 'master' into BHoward