testing meld
Merge branch 'master' of https://github.com/jjvester/effective_akka

Conflicts:
	readme.md