newThing added
khalilThing added
Merge branch 'khalil'