test
Merge branch 'master' of github.com:MinJaeKwon/voteAjou

Conflicts:
	apps/controllers.py