nuevos stills y cambios
Merge branch 'master' of https://github.com/macramole/ganztollweb

Conflicts:
	application/views/master_page.php
	css/ganztoll.css