bullshit and such
Merge branch 'master' of https://github.com/Rotten194/TJ-Hackathon-2013