add my name
merge
Merge branch 'dumkephoto-master'