first commit
Merge branch 'master' of github.com:ulysses-sl/clubmanager

Conflicts:
	.gitignore
	LICENSE
first commit
Merge branch 'master' of github.com:ulysses-sl/clubmanager