ignore .idea
Merge branch 'develop'
Merge pull request #2 from zombiesh/master

merge master and develop