Now with more comments!
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/player.js