unworking form
fixes merge issues
Added HTML/CSS design
new form
Merge remote-tracking branch 'origin/design' into tiffany-test
fixes merge conflicts