Evento
Merge branch 'master' of https://github.com/randyibarrola/topvoting

Conflicts:
	app/config/config.yml