"Commiting so I don't have to stash"
Merge branch 'tuesday_am' of github.com:msmith7904/burger_button

Conflicts:
	app/views/orders/show.html.erb
	app/views/users/new.html.erb