Version
Merge branch 'master' of https://github.com/bobby-brennan/lucy

Conflicts:
	package.json