removed .idea dir
merging dev into master
merging master into github-master