update gitignore to not include PyCharms
Merge remote-tracking branch 'origin/master'