fix and GUIS mofis
fiiix
Revert "fiiix"

This reverts commit 58cbbdff584c530e967c6487dc432d0fad894414.
test fix
Merge branch 'master' of https://github.com/Calenzanor/Bubble

Conflicts:
	hello-world/bin/com/gamefromscratch/helloworld/Player.class
	hello-world/src/com/gamefromscratch/helloworld/Player.java