WIP editing text
Merge branch 'text_editor'

Conflicts:
	db/database.sqlite3
	lib/app/views/shop.erb