Toggle for discount tier, calcs for markup vs margin, warning for IE8
Merge branch 'odell'
Merge branch 'master' of https://github.com/mattodell/MarginCalc into print_table

Conflicts:
	index.html
	js/marginCalc.js