Checkpoint.
Commit before copying in Amy's code.
Adding Amy's stuff, no changes yet.
Checkpoint.
Merge commit '70f8ec96b1cb76694d085044ee49df9945d8588c'

Conflicts:
	lab1.c