Merge pull request #12 from aitoroses/master

Pequeños cambios
Pequeñas modificaciones
Merge branch 'master' of https://github.com/danibram/danux

Conflicts:
	public/semiems/js/cond_inic.js
Terminados Los cambios en Tab1
Pestaña 3 a semiacabar
Pequeños apuntes
Merge pull request #13 from aitoroses/master

Menu armario enhanced
Merge branch 'master' of https://github.com/danibram/danux
Merge pull request #13 from danibram/master

Cambios en  Pestaña 3