fixed offset of objects
Merge branch 'master' of github.com:Rialgar/GGJ2014

Conflicts:
	js/Level.js