Update anne.txt
Update new.txt
cookbook
newfeature
x
Update yellow.txt
removed
newfeature  change_1
resolved merge conflicts
Merge branch 'master' of github.com:mortlake/test