removed .idea directory
Merge remote-tracking branch 'origin/master'
removed .idea directory