Added Photo Stuff
fixing Conflicts