ok
ok
Merge branch 'master' of github.com:stuycs-softdev/submissions

Conflicts:
	6/lui_marlena/groupinator/groupinator.py
hm
ugh

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

Conflicts:
	6/lui_marlena/groupinator/groupinator.py
done
Merge branch 'master' of github.com:stuycs-softdev/submissions