added real code
Merge branch 'back_to_cat_and_dog' into development