Better gitignore (remove PyCharm settings)
Merge remote-tracking branch 'origin/master'