File added
Merge branch 'Master2'

Conflicts:
	filemaster.txt