Merge branch 'master' of https://github.com/juliemr/protractor

Conflicts:
	README.md

Author: juliemr

README.md

@@ -1,7 +1,7 @@
 Protractor
 ==========
 
-Protractor is an end to end test framework for Angular applications built on top of webdriver. It is still quite in progress.
+Protractor is an end to end test framework for Angular applications built on top of [webdriverJS](https://code.google.com/p/selenium/wiki/WebDriverJs). It is still quite in progress.
 
 To run the sample tests
 -----------------------
@@ -10,7 +10,7 @@ Clone the github repository. Install the selenium-webdriver npm module
 
     npm install selenium-webdriver
 
-[Start up a selenium server](http://code.google.com/p/selenium/wiki/WebDriverJs#With_Node). By default, the tests expect the selenium server to be running at http://localhost:4444/wd/hub.
+Start up a selenium server. By default, the tests expect the selenium server to be running at http://localhost:4444/wd/hub.
 
 Start the test application
 
@@ -41,4 +41,17 @@ In your test file, set up protractor:
     // Configure and build your webdriver instance.
     var ptor = protractor.wrapDriver(driver);
 
-See httpspec.js for examples of use.
+See httpspec.js for examples of use.
+
+Appendix A: Setting up a standalone selenium server
+---------------------------------------------------
+
+WebdriverJS does not natively include the selenium server - you must start a standalone selenium server.
+Download the selenium server. All you need is the latest [selenium-server-standalone.](https://code.google.com/p/selenium/downloads/list)
+
+To use with chrome browsers, [download chromedriver](https://code.google.com/p/chromedriver/downloads/list)
+[More information about chromedriver](https://code.google.com/p/selenium/wiki/ChromeDriver)
+
+Start the selenium standalone with 
+
+    java -jar selenium-server-standalone-2.x.x.jar