Merge branch 'master' of https://github.com/danielduan/TimeTravelShell

Conflicts:
script.sh
timetrash
Merge errors