Merge branch 'master' of https://github.com/DevExpress/TestCafe-RPC

Conflicts:
	README.md
	index.js
	package.json

Author: inikulin

README.md

@@ -1,6 +1,6 @@
 TestCafe RPC
 ======
-RPC library for the [TestCafé](http://testcafe.devexpress.com/). It allows you to create a single TestCafé instance and then interact with it programmatically from any machine in your network.
+RPC library for the [TestCafé](http://testcafe.devexpress.com/). It allows you to create a single TestCafé instance and then interact with it programmatically from any machine in your network.
 
 
 Install
@@ -14,7 +14,7 @@ Running a server
 ```js
 var TestCafeRemote = require('testcafe-rpc');
 
-//Options for TestCafé instance
+//Options for TestCafé instance
 var opt = {
         controlPanelPort: 1337,
         servicePort: 1338,
@@ -29,10 +29,10 @@ var opt = {
     },
     rpcPort = 1339;
 
-//Create TestCafé server instance with given options which can be accessed via RPC on port 1339.
+//Create TestCafé server instance with given options which can be accessed via RPC on port 1339.
 var testCafeServer = new TestCafeRemote.Server(opt, rpcPort);
 
-//Returned object exposes standard TestCafé API, so you can use it as a regular TestCafé instance.
+//Returned object exposes standard TestCafé API, so you can use it as a regular TestCafé instance.
 testCafeServer.runTests({ browsers: testCafeServer.listAvailableBrowsers() }, function (errors, taskUid, workers) {
     //do smthg...
 });
@@ -46,11 +46,11 @@ var TestCafeRemote = require('testcafe-rpc');
 var rpcHostname = 'myhostname',
     rpcPort = 1339;
 
-//Connect to the existent TestCafé server (if you running both client and server on the same machine
+//Connect to the existent TestCafé server (if you running both client and server on the same machine
 //hostname-parameter can be ommited).
 var testCafeClient = new TestCafeRemote.Client(rpcPort, rpcHostname);
 
-//Client can be used as a regular TestCafé instance with exception that listAvailableBrowsers() and listConnectedWorkers()
+//Client can be used as a regular TestCafé instance with exception that listAvailableBrowsers() and listConnectedWorkers()
 //are asynchronous methods.
 testCafeClient.listAvailableBrowsers(function(browsers) {
     testCafeClient.runTests({ browsers: browsers }, function (errors, taskUid, workers) {
@@ -60,7 +60,5 @@ testCafeClient.listAvailableBrowsers(function(browsers) {
 ```
 Need more help to get started?
 --------------
-Visit TestCafé  [Continuous integration guide](http://testcafe.devexpress.com/Documentation/Tutorial/Continuous_Integration) and [Continuous integration API reference](http://testcafe.devexpress.com/Documentation/ApiReference/Continuous_Integration_API_Reference). If you have any additional questions or suggestions don't hesitate to ask using [DevExpress Support Center](http://www.devexpress.com/Support/Center/Question/ChangeFilterSet/1?FavoritesOnly=False&MyItemsOnly=False&MyTeamItemsOnly=False&TechnologyName=Testing+Tools&PlatformName=AllPlatforms&ProductName=AllProducts&TicketType=All).
-
-
+Visit TestCafé  [Continuous integration guide](http://testcafe.devexpress.com/Documentation/Tutorial/Continuous_Integration) and [Continuous integration API reference](http://testcafe.devexpress.com/Documentation/ApiReference/Continuous_Integration_API_Reference). If you have any additional questions or suggestions don't hesitate to ask using [DevExpress Support Center](http://www.devexpress.com/Support/Center/Question/ChangeFilterSet/1?FavoritesOnly=False&MyItemsOnly=False&MyTeamItemsOnly=False&TechnologyName=Testing+Tools&PlatformName=AllPlatforms&ProductName=AllProducts&TicketType=All).
 

index.js

@@ -1,3 +1,4 @@
+
 var net = require('net'),
     dnode = require('dnode'),
     TestCafe = require('testcafe').TestCafe;
@@ -75,3 +76,4 @@ Client.prototype.on = function (evtName, handler) {
     this._rpc('on', [evtName], handler, true);
 };
 
+

package.json

@@ -1,3 +1,6 @@
+
+
+
 {
     "name": "testcafe-rpc",
     "author": "DevExpress (www.devexpress.com)",
@@ -22,4 +25,4 @@
         "node-phantom": "~0.2.3",
         "phantomjs": "~1.9.2-0"
     }
-}
+}