first commit
Merge origin/master
Add gitignore