Merge branch 'master' into tranquil-timeline

Heartbeat/IndieURLSchemeHandler.swift

@@ -46,7 +46,7 @@ class IndieURLSchemeHandler:NSObject
                     {
                         let confirmationSheet = NSAlert()
                         confirmationSheet.messageText = "You cannot friend yourself."
-                        confirmationSheet.informativeText = "Love yourself. Be your own best friend. But don’t friend youself on Heartbeat… that’s just weird."
+                        confirmationSheet.informativeText = "Love yourself. Be your own best friend. But don’t friend yourself on Heartbeat… that’s just weird."
                         confirmationSheet.alertStyle = NSAlertStyle.WarningAlertStyle
                         confirmationSheet.addButtonWithTitle("OK")
                         confirmationSheet.beginSheetModalForWindow(NSApplication.sharedApplication().mainWindow!) { response in }