Gem Stringex
change /task/url/edit
Merge branch 'master' of github.com:heathered/task-project into diana

Conflicts:
	db/schema.rb