attempted stuff
Merge branch 'master' of https://github.com/angela97lin/TeamGemini