Merge branch 'master' into gui

Conflicts:
	Cargo.lock
	src/main.rs