working 90%
Merge remote-tracking branch 'origin/master'

Conflicts:
	terminatorplayer/TerminatorPlayer.java