refactor shotlist : key=obj
Merge branch 'master' of github.com:Moe-/Bacteria