Added something to branch1
Added some.py
Merge branches 'master' and 'branch1'