Manually merged pull request from sampollard/csci247lab1.