Updated Makefile and .gitignore