users_controller changes
Merge branch 'master' of https://github.com/mule-deer-2013/greenlight
Merge branch 'master' of https://github.com/mule-deer-2013/greenlight
Adds matching output to vote create controller
Fixes merge conflict in schema