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

Conflicts:
	application/views/modificar.php
	index.php