upgrade xcode
change file encoding to MacRoman
fix misspelling on MARRAIGES