New Blood
Merge branch 'master' of github.com:svenstaro/gamejam

Conflicts:
	GGJ2013/data/levels/tilesets/decorations2.png
	GGJ2013/data/levels/tilesets/psds/decorations2.psd