Test
Merge remote-tracking branch 'origin/master'
Test
This commit contains initial updates regarding the update supplies file. The inStock variable still needs to be set before the file will work.
Merge remote-tracking branch 'origin/master'

Conflicts:
	config.ru
	controllers.rb
	sandwiches.db
	views/supplies.erb
I created a short login form, which redirects to the make_order page. For now, if the username field is blank then the user will be redirected to the login page again. We need an erb file that queries the database of student users so that we can actually check what users type in.