first commit
testing the merging
index changes and adding the photo
adding a file for testing
fixing merge conflicts