Makefile and gitignore modified