updated stuff
Merge branch 'master' of github.com:wmarshall/autowub

Conflicts:
	src/autowub/Song.java