Merge branch 'master' of https://github.com/anudeep3998/MediaHub

Conflicts:
	README.md
	src/MediaHub.java