Merge remote-tracking branch 'upstream/master' into bd859
Merge remote-tracking branch 'upstream/master' into bd859
downsized pictures for continuous pictures working on downsizing single pictures
merge conflics
Merge remote-tracking branch 'origin/bd859' into bd859
picture sizes
merge
pictures app is good to go
Merge pull request #940 from bdonald25/bd859

Bd859