The missing commit. Sorry!
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	package.json