some dev
merge from master
fix break line mistake
Update a.txt
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	a.txt
add c thing
Merge pull request #1 from phucvin/dev

merge dev