1
1
Merge branch 'master' of https://github.com/lesliechen5705/Evocate
a
Conflicts:
	src/org/evo/evocate/home/Home_Invitations.java