added googletest module with sample test
 fixed merge conflicts.