Makefiles!
confusion
Merge branch 'master' into bring-in-rj
hurgh git is so hard.
Reformatting lyrics, adding moar lyrics.
if i find a syntax error, i get to push another song onto the pile.
breaksys!
Makefiles!

Conflicts:

	README.md
Kids and their music these days.
well, this is the world we live in.

Conflicts:

	lyrics
hurgh git is so hard.
attribution is hard, so I went shopping.
Reformatting lyrics, adding moar lyrics.

Conflicts:

	lyrics
Merge remote-tracking branch 'remotes/ccmo/master' into incestuous-branches

Conflicts:
	Makefile
	README.md
	lyrics
if i find a syntax error, i get to push another song onto the pile.

Conflicts:

	lyrics