Merge branch 'master' into feature-idea
New feature (in feature-idea branch) for testing conflict.
Merge branch 'feature-idea'

Conflicts:
	cool.txt