Cambios
Merge branch 'master' of https://github.com/danibram/danux

Conflicts:
	application/views/home/tab1.blade.php