Ignore .pyc files
Ignore .pyc files
Merge branch 'master' into HEAD

Reset to last known working commit