new tileset and corrected collision tiles
Merge branch 'master' of github.com:Rialgar/GGJ2014