added choices to questions, voting, templates, edited admin page
Merge branch 'master' of https://github.com/jdcheng/lvvs