Initial commit
Fixes IDEA project settings and .gitignore merge conflict