initial version
Add .gitignore
initial merge