Merge "Moved and updated gitignore and removed tracked .pyc files"