rake migrate
addin files before heroku setup
finished task controller
Merge branch 'master' of github.com:nivram80/the-nag into task_feature

Conflicts:
	Gemfile
	Gemfile.lock
	config/environments/development.rb
	config/routes.rb
	the-nag/.env
routes
Merge branch 'task_feature'

Conflicts:
	config/routes.rb