js not complete; updating branch
resolved conflicts between master and diffence branches
difference code works