Testing conflicts
Merge branch 'master' of https://github.com/hal7df/further-suggestions

Conflicts:
	Paul Bonnen/conflict.txt
Conflicts Resolved