delete *css.scss files
working with css
Merge branch 'master' of github.com:omahacodeschool/grant-tracker into diana

Conflicts:
	app/assets/stylesheets/application.css
Merge branch 'master' of github.com:omahacodeschool/grant-tracker
removed application.css
Merge branch 'master' into adam_grant
Adding dashboard
wip css
Merge branch 'permissions' of github.com:omahacodeschool/grant-tracker into heather
Merge branch 'master' into permissions
Dashboard
Merge branch 'master' into heather
wip css
Merge branch 'master' of github.com:omahacodeschool/grant-tracker into diana
wip
wip
Merge branch 'master' into adam_grant
Merge branch 'master' of github.com:omahacodeschool/grant-tracker into diana
Merge branch 'master' of github.com:omahacodeschool/grant-tracker
Merge branch 'master' into diana