some test changes
Merge branch 'master' of https://github.com/brookman/Ludum-Dare-26

Conflicts:
	ludum-dare-26/src/eu32k/ludumdare/ld26/LudumDare26.java
Merge branch 'master' of https://github.com/brookman/Ludum-Dare-26