pull gh
Merge branch 'master' of github.com:spelufo/dotfiles

Conflicts:
	.config/sublime-text-3/Packages/Jade/html.sublime-snippet
	.profile