fixing makefile-git issue
merging .gitignore