a
Merge branch 'master' of github.com:binhngo85/democakephp

Conflicts:
	a.txt