.
.
Merge branch 'master' of https://github.com/dpark1985/HTML5-WYSIWYG.git

Conflicts:
	README.md