Nuevos estilos
Merge branch 'master' of http://github.com/LuisEnVilla/CheckTrips

Conflicts:
	public/stylesheets/style.css

Cambios