update category
update merge objects
Merge branch 'master' into category
delete category
Merge branch 'master' of https://github.com/hub387/bardo
Merge branch 'master'