As done as it will be.
Merge branch 'master' of https://github.com/pierfied/Jukebox1.git
Merge branch 'master' of https://github.com/pierfied/Jukebox1.git

Conflicts:
	Jukebox1/src/test/JukeBoxTest.java