2 ENTIRE parentheses removed
votes do
Merge branch 'master' of github.com:afeinber/akk
Merge branch 'voting'

Conflicts:
	app/assets/javascripts/initializer.js
	app/assets/javascripts/profile.js