gitignore
fix
(some message stating you added .idea to ignored entries)
Merge branch 'dev'