git init
Merge branch 'master' of github.com:chombium/wearlyrics

Conflicts:
	.gitignore