README
Commit specifically to demonstrate what a merge conflict looks like
Merge branch 'PR-conflict' of https://github.com/adambullmer/doa2-team-generator into adambullmer-PR-conflict

Conflicts:
	README.md
Merge branch 'master' of https://github.com/gsbullmer/doa2-team-generator into adambullmer-PR-conflict

Conflicts:
	README.md
Merge branch 'adambullmer-PR-conflict'