Editor made changes??? maybe tab vs space...
Merge remote-tracking branch 'origin/master'

Probably breaking stuff...
Add .gitignore
Add testing file temp.py to .gitignore
Some trivial cleaning-up of spaces