Some hacky js for make glorious functionality of active shipments page
Merge branch 'master' of github.com:tmcneely/supply-ordering-system-prototype

Conflicts:
	js/application.js
Merge branch 'master' of github.com:tmcneely/supply-ordering-system-prototype
Fixed my shits