added dog pics
fixed conflicts