Added b
Edit to test.file
Merged branch1