small changes to makefile
Merge branch 'master' of https://github.com/forstermatth/2720-group