fix edit
add buckets
Merge branch 'master' of https://github.com/pinya/ttt

Conflicts:
	app/views/stuffs/my.html.slim