Changing Master.txt
Merge branch 'master' into branch_2

Conflicts:
	Master.txt