Resolve merge conflicts
Merge branch 'jaredscheib-VoteOptionsView'
Implement options stub
Resolve merge conflicts
Fix plan model method calls on sync
Merge pull request #32 from nickb1080/master

Implement options stub.