add modal
Merge branch 'master' of https://github.com/MinJaeKwon/voteAjou

Conflicts:
	apps/controllers.py
	apps/controllers.pyc
	apps/models.pyc