maybe fix bug?
Merge branch 'master' of https://github.com/osuHackathon/hackathon