snippets
Merge branch 'parabola'

Conflicts:
	.i3/config
	.vimrc
	init-script/bootstrap-dotfiles.sh
snippets
Merge branch 'master' of github.com:slspeek/dotfiles

Conflicts:
	.i3/config
	.vimrc
	init-script/bootstrap-dotfiles.sh