Merge branch 'master' of github.com:tlackemann/me into develop

Conflicts:
	README.md
changed readme
changed read me