added CTRL-C
Merge branch 'master' of https://github.com/adams5/415-project2

cause it is
clean and commented