first commit
set
models.py, variables.py 수정함
add forms, change settings
test
test for controllers
test for mac
test
Merge branch 'master' of github.com:MinJaeKwon/voteAjou

Conflicts:
	apps/controllers.py
test
test for mac
eeee
adadad
Merge branch 'master' of https://github.com/MinJaeKwon/voteAjou

Conflicts:
	.idea/workspace.xml
Update controllers.py
add loginform
change
ssssss
asd
test for mac