added more strings to promptStrings and errorStrings
commit
commit
commit
fleshed out report for importing photos
fixed massive merge conflict
fixed another stupid merge conflict (conflicting whitespaces)