Similarity Commit
Merge branch 'master' of https://github.com/pratik2911/MusicBigDataWeb

Conflicts:
	src/edu/music/HBaseApi.java