Updated gitignore

removed .idea
Merge remote-tracking branch 'origin/Develop' into Marc-Backend
Merge branch 'Marc-Backend' of https://github.com/Tyonar/JuliePro into Marc-Backend