created te email notification when somebody commets on a photo
fixed conflicts
Merged master onto styling branch