cap BEFORE
del photo.html for what?
10/12 11:49am Merge branch 'project'