confilicting
mege home.st together of https://github.com/taloto07/MusicBox.git

Conflicts:
	MusicBox/WebContent/WEB-INF/templates/home.st