Test commit
Merge branch 'marty'

Conflicts:
	main.wire
Merge branch 'Adam-Jones'
Merge branch 'master' of https://github.com/militantjones/estimator
Merge branch 'master' into Adam-Jones