Added uio user to login.uio.no and home user to get.ole-k.net
Merge branch 'master' of github.com:ochagenes/dotfiles

Conflicts:
	ssh/config
added user to login.uio and get.ole-k