line12 monitro_mem2
add watch cpu
add watch cpu
Merge branch 'master' of https://github.com/Jamesshi/my_script

Conflicts:
	monitor_mem2.sh