Initial commit
Use official gitignore
Fix conflict
Merge branch 'master' of github.com:frop/carabina