Added conflict with master. File test.py also created with different contents
Updated README.md with more info
Merge branch 'Br1'

Conflicts:
	test.py