Fixed paper collission and other stuff
Merged stuff.
Merged stuff
Merged sutff
Merge branch 'master' of https://github.com/Xander89/ngj2014