css que tendremos que ignorar
Merge branch 'master' of github.com:karlosgliberal/interzonascorp

Conflicts:
	app/styles/main.css
	app/styles/main.css.map
Ignore en los css