okk
Merge branch 'master' of https://github.com/desarrolllo/digitalD

Conflicts:
	application/views/home.php
	css/slyder.css