Added koding
Update OMZ
Merge branch 'master' into work

Conflicts:
	.ssh/config