...
...

Conflicts:
	assets/javascripts/clean_markdown.js