updating upstream
fixed merging conflicts with form.html
updated from upstream
mergin to upstream
styling home page
updated main.js to match repo
Merge pull request #13 from cxoltero/stylinghomepage

Stylinghomepage