Modified Makefile and gitignore