asdasdad
Merge branch 'master' of https://github.com/hoangducthien/baotri

Conflicts:
	data/IMAG0021.jpg