Clean up README (bitshares#666)

* Update README.md

* Issue 315 - Add Chart Clamp To Settings Dropdown (bitshares#373)

* Add Chart Clamp To Settings Dropdown

* Removed Unused Variable

Merging as is and then we'll see about handling the redraw bug in the next sprint.

* resolve conflict

* Update README.md

* Update README.md

* clean up readme

README.md

@@ -48,7 +48,6 @@ npm install
 
 The dev server uses Express in combination with Webpack.
 
-<<<<<<< fcd7d7a6e6b91ecd0695bdac7368ef9dbaaec712
 Once all the packages have been installed you can start the development server by running:
 
 >开发服务器使用了EXPRESS和Webpack.