merge
yes
Merge branch 'master' of https://github.com/ace1294/studyhuddle
finishing merge