updated .gitignore and makefile