fix text
Merge branch 'master' of https://github.com/ngotuan12/ASEProject
Merge branch 'master' of https://github.com/ngotuan12/ASEProject

Conflicts:
	myapp/templates/myapp/base.html