creating contoller actions
Merge branch 'master' of github.com:heathered/Task-Project

Conflicts:
	config/routes.rb