thangskyline commit
a
abc
thagnma commit
thangma lan thu 2
Merge remote-tracking branch 'origin/master' into master_thangma

Conflicts:
	app.js
wertsadf
Merge pull request #1 from thangskyline/master_thangma

Master thangma