for gitignore
commit
Merge branch 'master' of https://github.com/Jason52366/Volleyballscore

Conflicts:
	.gitignore