so done with this shit
Merge branch 'master' of https://github.com/codeisvek/CalHacks2014