Initial commit
gitignore - fix conflits