Shouldn't have put that last commit in this branch.
Merge branch 'master' into work

Conflicts:
	.bashrc
housekeeping