Initial structural commit
Fixed merge conflict in the gitignore file