Resolve merge conflicts
Merge branch 'jaredscheib-VoteOptionsView'
Add empty rounds array to PlanModel
Merge pull request #31 from jaredscheib/VoteOptionsView

Add empty rounds array to PlanModel, shorten function invocations in PlanModel initialize
Resolve merge conflicts