merged manually

Author: psugihara

README.md

@@ -6,6 +6,7 @@ The recent emergence of the WebSocket protocol has given developers a new tool t
 
 Joint takes care of this repetitive, boilerplate configuration automatically so that the programmer can immediately begin work on the main application logic. The entire network architecture is abstracted into a few intuitive functions that facilitate seamless communication between server and client. Joint also allows functions on the server to be called like any other function on the client, and vice versa. Moreover once these connections are established, Joint provides convenient functions to help organize, search through, and keep track of them.
 
+
 ##Installation
 Joint requires *node.js* and *npm*. Once you have these dependencies, simply:
 

docs/javascript_style.md

@@ -10,6 +10,7 @@ This document lays out conventions for JavasScript in the Joint source code.
 * Use line breaks between function definitions.
 * Use 1 space before and after assignment operators.
 * Use 1 space before and after function argument lists in declarations.
+* Use 1 space before and after outer parens in conditionals and argument lists.
 * Don't use spaces after `{`, `[`, or `(` or before `}`, `]`, or `)`.
 * Terminate all expressions with semicolons.
 * Always use `var` when initializing a variable. All variables should be local to the current scope.

package.json

@@ -16,7 +16,7 @@
     "node": "*"
   },
   "author": "Peter Sugihara <[email protected]> (campsh.com/peter), Nick Pizzoferrato",
-  "description": "A hand-rolled real-time JS web framework for single page apps.",
+  "description": "A hand-rolled real-time node.js framework for connecting single page apps",
   "homepage": "https://github.com/ptrsghr/joint",
   "repository": {
     "type": "git",