Styles
Styles
Merge branch 'master' of https://github.com/LuisEnVilla/OnTime

Conflicts:
	Servidor/npm-debug.log