Photo Stuff
Merge branch 'master' of https://github.com/militantjones/estimator

Conflicts:
	main.wire