Cong commit
Merge branch 'master' of https://github.com/congdm/Group-SE-1-K56CA-UET-VNU

Conflicts:
	quizz/main/views.pyc
	quizz/quizz/database.dat
	quizz/quizz/urls.py
	quizz/quizz/urls.pyc