Merge pull request #16 from caherfe/master

Finalizados cambios
Añadido css nuevo
Merge branch 'master' of https://github.com/Luiscgr/Dharmae into Luiscgr-master

Conflicts:
	DharmaeFinal/css/EstilosIndex.css
Merge branch 'Luiscgr-master'
Merge branch 'master' of https://github.com/caherfe/Dharmae

Conflicts:
	DharmaeFinal/css/EstilosIndex.css