Merge branch 'master' of github.com:SenSing/Programming-Guide into tim
Makefile & new content