Init commit
Merge branch 'master' of https://github.com/samiljin/basketball-manager

Conflicts:
	.gitignore