no message
Fix commits conflict
Merge branch 'Working' of https://github.com/nhunght57/EnglishStudy_Web

Conflicts:
	EnglishStudy_Web/settings.py
	EnglishStudy_Web/static/CSS/style.css
	EnglishStudy_Web/templates/bottom.html
	EnglishStudy_Web/templates/top.html
Revert merging
Clean as it should be (please don't push to wrong branch again!)
homepage demo
homepage
Add some codes related to login process
hoàn thiện homepage
Fixed some tracnghiem views and added more tests
Merge remote-tracking branch 'origin/Working' into Working