Add body.scss file
completing dumb merge
Add basic form
Complete merge