First pass of a welcome page
Kind of working active shipments page
Merge branch 'master' of github.com:tmcneely/supply-ordering-system-prototype

Conflicts:
	index.html
	sass/application.scss
Made some proper progress with the active shipments page
Merge branch 'master' of github.com:tmcneely/supply-ordering-system-prototype