collision test!
Merge branch 'master' of https://github.com/theagentd/WeShallWake.git

Conflicts:
	WSWGFX/src/Mya.java