input attempts failed
Merge remote-tracking branch 'origin/master'

Conflicts:
	PricelessCalc-Imperial.js
	index.html