Update
Merge branch 'master' into work

Conflicts:
	dot.shrc
Update gitconfig
Merge branch 'master' into work