Changes
Merge branch 'master' of https://github.com/MichaelLubow/testing

Conflicts:
	file1.txt