added sublime files to gitignore
fix merge conflict in gitignore
Changed last name
Photo added
fixed the merge issue with .gitignore