test for mac
push test
test
jasontest
jasontest
Merge branch 'master' of github.com:MinJaeKwon/voteAjou

Conflicts:
	apps/controllers.py
	apps/forms.py