w
Merge branch 'master' of https://github.com/azsazsin/isometric-love2d

Conflicts:
	blender/Thumbs.db