merged with michelle fix photo append
fixed merged
final push for the night