히스토리 추가 코딩주
Merge branch 'master' of github.com:nightbreeze6846/likelionexercise

Conflicts:
	app.yaml
	apps/templates/mypage.html