made a gitignore file for .pyc files
merge conflicts with master