fixed some indentation and cleaned up code in general
Merge branch 'master' of https://github.com/isaiahmathieu/pocketpickup

Conflicts:
	PocketPickup/AndroidManifest.xml
	PocketPickup/src/com/uwcse403/pocketpickup/ParseInteraction/Translator.java
fixing stuff
Merge branch 'master' of https://github.com/isaiahmathieu/pocketpickup

Conflicts:
	PocketPickup/src/com/uwcse403/pocketpickup/CreateGameActivity.java