Merge pull request #4 from caherfe/master

Añadido Slider AL FIN =)
Adaptado a todos los dispositivos
Adaptacion final
Merge branch 'master' of http://github.com/Luiscgr/Dharmae into Luiscgr-master

Conflicts:
	DharmaPag/public_html/php/inicio.php
Merge branch 'Luiscgr-master'