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

Conflicts:
	AseProjec/urls.py
	myapp/views/Home.py