scaffolding task controller
Merge branch 'master' of github.com:arkiver/TestApp

Conflicts:
	app/controllers/tasks_controller.rb