aaaaa
Merge branch 'master' of github.com:tranchien/test

Conflicts:
	sqlB.txt