Updating gitignore for .pyc files.
Completing merge.