More frameworking
Merge branch 'master' of github.com:davidmaitland/vote-logic