Edited Groupinator
Merge branch 'master' of https://github.com/stuycs-softdev/submissions

Conflicts:
	7/mei_kelvin/Groupinator/groupinator.py