Order history: I gave that bitch some style. Bitches love style.
Merge branch 'master' of github.com:tmcneely/supply-ordering-system-prototype
Merge branch 'master' of github.com:tmcneely/supply-ordering-system-prototype

Conflicts:
	sass/application.scss