merged
jhgc
Merge branch 'master' of https://github.com/Multithread/MusicPlayer.git

Conflicts:
	MusicPlayer/pom.xml
	MusicPlayer/src/gui/Main.java