test
Add dev instruction
Merge remote-tracking branch 'origin/atomic-editing'

Conflicts:
	README.md