..
Merge branch 'master' of https://github.com/mhrisse/lotus

Conflicts:
	README.md
	server.js