inclusion de compass
git ignore
Merge branch 'master' of https://github.com/fabianrios/financial

Conflicts:
	sass/app.scss
	stylesheets/app.css