fixing the resize stuff
ordering the stuff
Merge branch 'master' of github.com:Rialgar/GGJ2014