added a test readme file to tvw branch
fixed conflict in README