all but edit and update
all working but update
Merge github.com:juliataitz/amoeba-circus-on-rails