remove makefile only needed by gh-pages branch
Merge branch 'master' into gh-pages
add makefile
udpates