Merge fix
Merge branch 'master' of git@github.com:aroth4/Unbearable.git

Conflicts:
	Unbearable/.classpath