Added master.py
Fixed bug in master.py
Merge remote-tracking branch 'origin/master'

Trying to resolve differences between remote master and local master