Le hago slice a las listas para ahorrar espacio en memoria
Ignoro ficheros de backup
Merge branch 'master' of github.com:PyCamp/Rockola
Added backbone and underscore.
Added dumb json generators.
Implementing client side poll logic.
Merge remote-tracking branch 'origin/master'

Conflicts:
	ui.py
Merge branch 'master' of https://github.com/PyCamp/Rockola

Conflicts:
	templates/index.html
Merge branch 'master' of git://192.168.10.131/Rockola
votes engine mejorado y testeado con la cola
Merge branch 'master' of git://192.168.10.131/Rockola
Added flask-sse to requirements.txt.
Merge remote-tracking branch 'cancerbero/master'
Modificados los Inputs y los Outputs de Votesengine
Merge branch 'master' of git://192.168.10.131/Rockola
Modified the way the rabbitmq abstraction is done.

Please, review the attached examples to learn how to use the new code.
Merge branch 'master' of git://192.168.10.131/Rockola
Add documentation to the queue_manager.
ui changes
Merge branch 'master' of git://192.168.10.131/Rockola