6btn can change person
Merge remote-tracking branch 'origin/master'

Conflicts:
	VolleyGameRecord.iml
	app/src/main/java/com/volleygamerecord/app/GameStart2.java
	app/src/main/java/com/volleygamerecord/app/LogIn.java
	app/src/main/java/com/volleygamerecord/app/Record1.java
6btn can change person