gi do
Merge branch 'learning' of https://github.com/nhunght57/EnglishStudy_Web into learning

Conflicts:
	EnglishStudy_Web/urls.py
	db.sqlite3
	homepage/views.py