test
:wq
sMerge branch 'master' of github.com:ruslanti/rubicon

Conflicts:
	module/Makefile
user mode client