Pull at Freja
pull at freja
Merge branch 'master' of github.com:muldvang/dotfiles

Conflicts:
	.gitconfig