added foo
removed foo
Merge branch 'master' of https://github.com/Akiira/Test1