4
Merge branch 'ajax-voting' of https://github.com/Ratsmash-dev/RMash into ajax-voting

Conflicts:
	app/assets/javascripts/voting.js.coffee
	app/controllers/votes_controller.rb
	app/views/voting/choose.html.haml