그냥 커밋해야 대서 한거지 푸쉬안할거야
ㅇㅇ
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
???
Merge commit '2fad51ce0a1de1a9fcf73b517f3d36744055430c' into evaluate

Conflicts:
	db.sqlite3
Merge commit '3fac28901e8277b7f681b0b9219550ace975f3cd' into evaluate

Conflicts:
	dbproject/forms.py
url merge conflict
company evaluation mapping
evaluate 수정
evaluate debuggg
dfaffasf
Merge commit 'f92d4274535b5d5f0c3d0511602980048b723835' into evaluate

Conflicts:
	db.sqlite3
평가하기 디버
Merge remote-tracking branch 'origin/evaluate' into JunIck

Conflicts:
	db.sqlite3