Cleaned the code a bit
Merge branch 'master' of https://github.com/Elioht/CalHacks