Added the makefile
Merge branch 'master' of https://github.com/conradfay/ECS40-HW2
asdf