up
Merge branch 'master' of https://github.com/shell0dh/rust-demo

Conflicts:
	test1.rs