updated Makefile and .gitignore