Version Actualizada Luis
Merge branch 'master' of https://github.com/Luiscgr/Dharmae into Luiscgr-master

Conflicts:
	DharmaeFinal/css/EstilosIndex.css
	DharmaeFinal/php/Reiki.php
Merge branch 'Luiscgr-master'
Fusionado Luis y Carmen (Solución conflictos merge)