Working on default names for teams/games
Merge branch 'master' of https://github.com/NeilRaina/FriendScore

Conflicts:
	FriendScore/res/values/strings.xml