some refactoring
Merge branch 'master' of https://github.com/max777alex/lebs

Conflicts:
	src/com/lebs/Song.java