Makefile and updated .gitignore