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
wip
Merge branch 'master' into adam_grant
Merge branch 'master' of github.com:omahacodeschool/grant-tracker into mailer
Radio buttons work on users#show

Need to work on submit action and pass in the correct value for user's task_id