tim's 2nd commit.
Lyrics only
Merge branch 'master' of github.com:imvarda/TempTest

Conflicts:
	test.txt