Fixed stuff
Merge branch 'master' of https://github.com/obezi/HackCMU2013