added some jquery stuff
"small changes with html"
solved merge conflict?
"merging"
Merge branch 'master' of github.com:/sandyaaaa/meethalfway