그냥 커밋해야 대서 한거지 푸쉬안할거야
ㅇㅇ
Merge commit '1bf25954945c5dc66d37ff07f5b98caeeb55f57f' into evaluate

Conflicts:
	database/models.py
	db.sqlite3
	dbproject/forms.py
	dbproject/templates/dbproject/evaluation.html
	dbproject/urls.py
	dbproject/views.py