Merge branch 'master' into Dustin
Morning commit

Added contain="yes" to some images
fixed inspection
Merge branch 'Dustin'
Merge branch 'master' into Dustin
Merge branch 'Dustin'
Merge branch 'master' of https://github.com/militantjones/estimator

Conflicts:
	main.wire
Merge branch 'Adam-Jones'
Merge branch 'master' into Adam-Jones