javascript almost working
conflict after merge resolved
js working, css looks bad for button
merge conflict
sorted out a merge conflict
changed some css
merge conflict resolved