New makefile
Merge https://github.com/rynechaloux/CSE120Project2
Merge