Added Testfile1 for test1
added testfile3 on test1
Merge branch 'master' of https://github.com/johnlee/test
This was to resolve merge conflict with testfile1: