Updated lockfile.
Merge branch 'master' of github.com:spiffyjr/spiffy-user

Conflicts:
	composer.lock