Merge branch 'master' of https://github.com/OnlineMagic/GroupProjects.git