JS not starting.
Merge branch 'master' of github.com:Hamdan85/carisaac into theme

Conflicts:
	app/assets/javascripts/js.js