.
..
Merge branch 'master' of https://github.com/artish/Dotfiles

Conflicts:
	dotfiles.sublime-workspace