Merge pull request #1 from fsmith/test1

test change
test2
another test
Merge branch 'master' of https://github.com/franSmith/Test into test1

Conflicts:
	test1/readme.txt