migrating le gomo
Merge branch 'master' of https://github.com/melodyju/offset

Conflicts:
	Player.java