Added more text
Merge branch 'master' of https://github.com/marplesoft/g

Conflicts:
	foo.txt