Song correction
Merge branch 'master' of github.com:joshaw/OpenSong

Conflicts:
	Settings/MainSettings