로컬에서 풀스팩 돌아감
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/templates/header.html
	app/templates/main.html
	app/templates/result_register.html
	app/templates/signUp.html
로컬 버전