working with rebecca on js stuff
fixed merge conflicts, added on click function to js