syncing to get Grace's demo

minor changes to Photo in my sandbox