makefile
Merge branch 'master' of https://github.com/camhart/ecen425_lab4b into syphe
Merge branches 'master' and 'syphe'