corrections
Merge branch 'master' of github.com:shimarin/shimarin.com

Conflicts:
	netkjk/zabbix01.html
wikipedia refs added