mobile design
Merge branch 'master' of github.com:omahacodeschool/grant-tracker

Conflicts:
	app/views/layouts/application.html.erb
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
working on AWS S3 uploading