update
Merge branch 'master' of github.com:casagrande24/dotfiles

Conflicts:
	parts/dev.sh