new commit
Merge branch 'master' of
https://github.com/vvpalav/DBProjectFrontEnd.git

Conflicts:
	DBProjectFrontEnd/WebContent/genres_liked.html