Merge branch 'master' of https://github.com/ebach/ebach_collab into ebach-master

Conflicts:
	README.md
changed files
files