add, editing and delete method
Merge branch 'master' of github.com:Medesko/confiture

Conflicts:
	app/views/layouts/application.html.erb
	config/database.yml