ignore
fix
Merge branch 'master' of http://github.com/hybridlord/dotfiles

Conflicts:
	gitconfig