update
Merge branch 'master' of https://github.com/fdwills/wills

Conflicts:
	bashrc