Changes to Makefile and .gitignore