added quotes
Merge remote-tracking branch 'origin/master' into quotes
quotes part 2
removed rmash lite routing option
Merge branch 'quotes'

Conflicts:
	app/views/layouts/application.html.haml
	app/views/voting/home.html.haml
	config/routes.rb
	db/schema.rb