fixed compiler issues in TokenSearch.h
fixed merge conflict
fixed difference.h grading for tokens