upload
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
	app/src/main/java/com/volleygamerecord/app/LogIn.java
	app/src/main/java/com/volleygamerecord/app/MyGame.java
	app/src/main/res/layout/activity_mygame.xml
upload