no message
Merge branch 'master' of github.com:nightbreeze6846/likelionexercise

Conflicts:
	apps/controllers.py
	apps/templates/memberout.html