cdscscscsc
Merge branch 'master' of https://github.com/JunneYang/memmonitor

Conflicts:
	memmonitor/memmonitor
	memmonitor/memstat