fixed bug
Merge branch 'master' of https://github.com/Queens-Hacks/the-best-idea
removed merge conflicts