First commit
merge gitignore
hotfix