OMG, I'm so stupid
Merge branch 'origin/my_branch' of github.com:ragcaty/cs111 into 1b

Conflicts:
	lab1-Skeleton/alloc.o
	lab1-Skeleton/execute-command.o
	lab1-Skeleton/foo
	lab1-Skeleton/main.o
	lab1-Skeleton/print-command.o
	lab1-Skeleton/read-command.c
	lab1-Skeleton/read-command.o
	lab1-Skeleton/timetrash