Updated Makefile and the .gitignore