lol3
Merge branch 'master' of https://github.com/RedSQ/LD30

Conflicts:
	assets/test.xml