Identify as master.
Introducing a conflict (I think)
Testing again - removing something.
Merge branch 'dev'

Conflicts:
	README.rdoc