a
a
Merge branch 'master' of https://github.com/gunnarahlberg/dotfiles

Conflicts:
	.bashrc
	.gitconfig
b