Add HTML editor
Merge branch 'master' of https://github.com/Chavjoh/MATHunter

Conflicts:
	app/views/chapters/_form.html.erb