should add Makefile now...
Merge branch 'master' of https://github.com/ayoung01/cs124prog3