Got rid of xib for container and for photo and number
Fix merge conflicts
Frames set up correctly