ok

ok
ok

ok
ok

...
new

new
commiy

commit
grupos

se sube con grupos ok
Merge branch 'master' of https://github.com/joseberna/PollApp

Conflicts:
	css/noticias.css
	css/noticias.styl
	js/noticias.js