renames this.result to self.result
Merge branch 'master' of https://github.com/ChadAngelelli/Manana
renmaes files/methods
adds HTML token for single lines of plain HTML