a
Merge branch 'master' of http://github.com/himaaaatti/dotfiles

Conflicts:
	gitconfig