Edit to correct merge conflict
Added edit task form and show task page
Merge branch 'master' of github.com:kschmit90/TaskManagerProject

Conflicts:
	config/routes.rb