makefile and gitignore modified