bug fixed: cannot "show" command
Merge remote-tracking branch 'origin/master'

Conflicts:
	bashmark.sh