print return code
Merge branch 'master' of github.com:sandsmark/dotfiles

Conflicts:
	bashrc