manage rosters
commit merged
club merge
resolved club merge
Merge branch 'master' of https://github.com/dbigelow25/scaha

Conflicts:
	scaha/src/com/scaha/objects/Club.java