Primer commit
1.0
Merge branch 'master' of https://github.com/luchohero/Pastaza-Al-Dia

Conflicts:
	app/templates/index.html
	pastazadeportivo
Puyonoticias