Resolving conflicts
Merge branch 'master' of
https://github.com/pratik2911/MusicBigDataWeb.git

Conflicts:
	src/edu/music/HBaseApi.java