Merge branch 'master' of https://github.com/WashDesign/Toolbox

Conflicts:
	README.md
removed the conflict back to the 12 = state