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
Merged from master
Merge branch 'BHoward'
changed Hello World! to Greetings!
Merge branch 'master' of https://github.com/bharris057/potato
Merge branch 'master' of https://github.com/bharris057/potato.git

Conflicts:
	HotPotato/src/com/lowbrassrage/hotpotato/CreateGameActivity.java
	
Also, got some partial implementation of starting registration and
discovery