Controller Update for missing actions
Merge remote-tracking branch 'upstream/master'
Add basic instructions to README
Fix JSON format
Slowly completing the service model
Merge pull request #3 from amacgregor/master

Controller Update for missing actions
Merge branch 'master' of github.com:Vinai/magehack-voting into Vinai-master

Conflicts:
	README.md