Add .gitignore, and update Makefile