Hola
ok
Merge branch 'master' of https://github.com/manuelblanch/codeigniter

Conflicts:
	application/controllers/welcome.php
	index.php