Merge branch 'master' of https://github.com/conproctor/UCLA-CS111

Conflicts:
	read-command.c
idk
merges read-command.c?