Readme changed
Readme changed emacs
Merge branch 'testing'

Conflicts:
	README.md