Committing to make git happy

See title
Merge branch 'master' of https://github.com/andys91/Psycho

Conflicts:
	core/bin/com/andrew/sampson/psycho/LIbgdxGame.class