Mike's changes
Merge branch 'master' of https://github.com/mikelowe/GitTest

Conflicts:
	testfile