ignore intellij files
setup.py update
Merge pull request #2 from kmk2000/master

Fix setup.py