Generating a conflict to resolve
Generating a conflict to resolve
Merge branch 'story-12-handling-conflicts-sourcetree'

Conflicts:
	README.txt - Resolved
	aboutit/LICENSE.txt - Resolved