Dashboard WIP
Updating params/org_id
Mailer works like a charm
Fixed links in email message
mobile design
User stories WIP
fixed a bug
Merge branch 'master' into adam_grant

Conflicts:
	app/models/grant.rb
	app/views/tasks/new.html.erb
Merge branch 'master' of github.com:omahacodeschool/grant-tracker

Conflicts:
	app/views/layouts/application.html.erb
Merge branch 'master' of github.com:omahacodeschool/grant-tracker into mailer
Removed old admin dash partial from Organization view folder
ran migration to add image to grant model
fixed bug
WIP
Merge branch 'master' into heather
Add new grant working now.
wip
Merge branch 'master' of github.com:omahacodeschool/grant-tracker into diana

Conflicts:
	app/views/tasks/show.html.erb
Merge branch 'master' of github.com:omahacodeschool/grant-tracker
Merge branch 'master' into diana