First commit
fixed merge conflicts in gitignore