Merge branch 'master' into Dustin
Merge branch 'master' into marty
Made some other changes to fix crashing on gen estimate in summary page
Merge branch 'marty'
Merge branch 'master' of https://github.com/militantjones/estimator
Merge branch 'master' into marty
Added Image column to productsdb, saving image url to db for summary
Merge branch 'marty'
roof measurements in summary
Merge branch 'Dustin'
Merge branch 'Adam-Jones'

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