no message
Merge origin/master
Merge origin/master

Conflicts:
	src/java/session/MusicFacade.java
carlos
Merge branch 'master' of https://github.com/guigx/Proj5