first commit
Merge branch 'master' of https://github.com/Jason52366/VolleyGameRecord

Conflicts:
	.gitignore