Agregando logo al sitio
Conflictos resueltos

Merge branch 'master' of https://github.com/gmaniako/frozen-test

Conflicts:
	app/views/index.php
	css/global.css