adding some extra content to the master branch
Merge remote-tracking branch 'origin/master' into branch2

Conflicts:
	branching/newfile.py
Added line 2 in the b2