d
Merge branch 'master' of https://github.com/Weldeasy/godcode

Conflicts:
	application/controllers/inicio.php