Added stuff
Merge branch 'master' of https://github.com/jpedrorl/CampJam14