Why was a class file added, it should be in the
.gitignore...
Merge branch 'master' of github.com:The-Helix-Prophets/VideoGame

Conflicts:
	bin/helixprophets/Main.class