edit to allow text-area recognize html tags
Merge branch 'master' of https://github.com/Ogamedia/Rails_Overflow

Conflicts:
	log/development.log