:dudu::riot: Merge branch 'master' of github.com:yaon/lottery

Conflicts:
	src/io_thread.rs
	src/main.rs