Cambio en Master
Resolve bug 55
fixed hot problem
finished new feature
Conflicts resolved:Merge branch 'bug55'

Conflicts:
	config.html
Merge branch 'master' of https://github.com/jmroca/TextWatchES