Stone added
Stone interchanged
Changed map generator to layers; added fireplaces
Merge branch 'master' of github.com:nczempin/lizard-journey

Conflicts:
	love2d/world.lua
Tree added; More bushes added
Added minimalistic menu
Fixed conflict.
Merge branch 'feature/behaviour'

Conflicts:
	love2d/world.lua
Assets_01: Smaller changes done
this comment no longer applies
Merge remote-tracking branch 'origin/assets'