.idea directory added
Merge branch 'master' of ssh://github.com/schuppo/test