restoring tasks
Merge branch 'basics_rspec_03' into basics_rspec_04
Merge branch 'basics_rspec_04' into basics_rspec_05
Merge branch 'basics_rspec_05' into basics_rspec_06
Merge branch 'basics_rspec_06' into basics_rspec_07

Conflicts:
	gatherer/spec/models/task_spec.rb