Migrate due:datetime
Merge branch 'master' of github.com:omahacodeschool/grant-tracker into heather

Conflicts:
	db/schema.rb
Org/User ANAF WIP
Only admin can view grants/new
Added current_user.admin to grants#create
Basic permissions
Tasks listed in grants#index
Added static pages
Added pages#index
Added admin_dashboard partial
Modifying layout divs.
New user to Organization link in Admin dashboard
Merge branch 'permissions' of github.com:omahacodeschool/grant-tracker into permissions
Merge branch 'master' of github.com:omahacodeschool/grant-tracker

Conflicts:
	db/schema.rb
rake db:migrate
Merge branch 'master' into permissions

Conflicts:
	app/controllers/grants_controller.rb
	app/controllers/tasks_controller.rb
	app/models/grant.rb
	app/models/task.rb
	app/views/grants/index.html.erb
	app/views/tasks/_form.html.erb
	db/schema.rb
Migrate
Merge branch 'master' of github.com:omahacodeschool/grant-tracker
Merge branch 'master' into permissions

Conflicts:
	app/controllers/grants_controller.rb
	app/controllers/tasks_controller.rb
	app/views/grants/index.html.erb
	app/views/tasks/index.html.erb
Recreated dashboard in Organizations#show as opposed to Org#index