update README.md
Configuracion
Vagrantfile
Configuraciones puppet
Configuraciones Puppet
Configuraciones puppet
index
d
f
config
Merge branch '003/erick/set-up'

Conflicts:
	application/config/config.php
 htaccess config
Merge branch 'master' into 001/juan/fixtures

Conflicts:
	README.md