.gitignore -add .idea
Merge branch 'master' into debugGuill