Random comment
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/static/js/handlers/exercise.js