github edit test
Update README.md
Update README.md
Update README.md
..
Merge branch 'master' of https://github.com/mhrisse/lotus

Conflicts:
	config.json
Merge branch 'master' into develop

Conflicts:
	README.md