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

Conflicts:
	.bashrc
Update