Second commit UI
Merge branch 'master' of https://github.com/robinpipirs/javamp3player

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/robinpipirs/javamp3player