server config
Merge branch 'master' of github.com:WisZhou/supervisord-monitor

Conflicts:
	application/views/welcome.php
Merge branch 'master' of github.com:WisZhou/supervisord-monitor
fixMerge branch 'master' of github.com:WisZhou/supervisord-monitor

Conflicts:
	application/views/welcome.php
Merge branch 'master' of github.com:WisZhou/supervisord-monitor

Conflicts:
	application/views/welcome.php