合并时的修改
Merge branch 'master' of github.com:FoOTOo-BootCamp/Hosts-Status-Monitor

Conflicts:
	Client/Monitor.py
	Server/save.py