improved git-display; changed org-marker to superman-item-marker; tentatively clean buffer-list
maybe fixed bug in commit marked
added date to versions in diff-display, fixed trim-hash, removed keyboard from changed files display
nothing
solved merge conflict