Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
drawing a circle
Merge remote-tracking branch 'origin/master'

Conflicts:
	player.js
fix undefined typo