created task.rb and tasks table ad task_controller.rb
Merge branch 'master' of github.com:heathered/Task-Project

Conflicts:
	Gemfile.lock
database created