master comm
abc
thangma lan thu 3
Merge remote-tracking branch 'origin/master' into master_thangma

Conflicts:
	app.js