index
f
Merge branch '003/erick/set-up'

Conflicts:
	application/config/config.php
 htaccess config