Ignoring PyCharm IDE files
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Deleting redundant file, fixed undefined reference
Merge remote-tracking branch 'origin/master'