first dummy character
Merge branch 'master' of https://github.com/nczempin/lizard-journey

Conflicts:
	love2d/world.lua