added IntelliJ *.iml to gitignore
Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from AS3NUI/master

GitIgnore IntelliJ .iml project