added what people are clicking on
fixed merge errors in js file
fixed more merges?