getting ready to pull
Merge branch 'master' of ssh://github.com/eecs452/eecs452maav

jfieoahea
Merge branch 'master' of ssh://github.com/eecs452/eecs452maav
Merge branch 'master' of ssh://github.com/eecs452/eecs452maav
modified makefile