photos working
merging with Jessicas photo branch