settings votes page
Merge branch 'master' of https://github.com/MinJaeKwon/voteAjou

Conflicts:
	apps/controllers.py