added object layer
Merge branch 'master' of https://github.com/eirikurorri/lucifer

Conflicts:
	hero.lua
rect objects collide properly
Merge branch 'master' of https://github.com/eirikurorri/lucifer