Update CONTRIBUTORS.md
Merge branch 'master' of https://github.com/madFloyd/MediaBrowser

Conflicts:
	CONTRIBUTORS.md