some modify
Merge branch 'gh-pages' of https://github.com/PhuongNM4/ChatAppRepo into gh-pages

Conflicts:
	javascripts/ChatApp.js