Merge branch 'master' of https://github.com/goper/portafortuna.loc
Merge branch 'master' of https://github.com/goper/portafortuna.loc

Conflicts:
	application/views/index/carcass.php