3rd commit
Merge branch 'master' of https://github.com/zywyz/mgr

Conflicts:
	file1