Updating UI
Merge branch 'master' of https://github.com/briankracoff/MoodMusic

Conflicts:
	input/Import.py
	moodmusic.py
	song/song.py

fix conflicts
fix a few bugs in new UI