makefile adapted
Merge branch 'master' of github.com:nickma82/ws13_algo_msp