Updating readme
Merge branch 'master' of https://github.com/ccnmtl/mediathread

Conflicts:
	README.markdown