added promises
Merge branch 'master' of https://github.com/jonarnaldo/jonarnaldo.github.io

Conflicts:
	ChatBuilder.js