updated UI.java and Song.java
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/Song.java
changed song constructor