Another Update

ZzzzzZZ....
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/parse/tagteampi/GameSettingsActivity.java
myfinal progress

I need to actually save the data in parse so it can be referenced
better linking into parse

still need to add users to a game and then launching it.
getting
Merge branch 'dev' of https://github.com/npruis/TagPi2 into dev