add .gitignore
add Makefile
Merge branch 'makefile'