fixing stuff
https
removed jquery
stringing
merge conflicts