modified .gitignore and Makefile