fixed conflicts with last merge
Merge branch 'master' of https://github.com/pickettbd/famPhotoShare

Fixing the conflict issues