merge
Merge branch 'master' of https://github.com/mindbergh/15-441-project-3
modify makefiel