Seeing what sticks
Merge branch 'lib'

Conflicts:
	package.json