Merge branch 'master' of github.com:mgreenly/experiments
update makefile