more commits

doing best to fix formatting and validation errors but it won't work if
i remove the error
neworderform
Merge remote-tracking branch 'origin/master'

Conflicts:
	hw2.css
adding my new order form

what