Cargo setup
Merge branch 'master' of https://github.com/johannhof/lava

Conflicts:
	.gitignore