Change Makefile and .gitignore