Updated Makefile and gitignore