updating upstream
fixed merging conflicts with form.html
updated from upstream
mergin to upstream
styling home page