composer.lock
Merge branch 'master' of github.com:dshum/songs

Conflicts:
	composer.lock