Updating .gitignore to ignore data backup directories
Adding *.pyc to .gitignore
Resolve .gitignore conflict