modified .gitignore, makefile