Readme
Merge branch 'master' of github.com:torkale/streaming

Conflicts:
	Readme.md