committing before merging
Merge branch 'master' of github.com:stung/cs111timetravel
Fixed merge conflicts in read-command.c