updated read for master build 440.18

readme.md

@@ -1,7 +1,4 @@
-TINYG EDGE BRANCH
-========
-
-<<<<<<< HEAD
+TINYG MASTER BRANCH
 ![TinyG v7 Board](http://farm9.staticflickr.com/8186/8436183471_6b3708cd0d_c.jpg)
 
 TinyG is a 6 axis motion control system designed for high-performance on small to mid-sized machines. Some features:
@@ -24,8 +21,7 @@ See these links for more details.
 
 
 CURRENT MASTER VERSION
-========
-The current master version is 0.96, BUILD 380.08
+The current master version is 0.97, BUILD 440.18
 Please refer to the [TinyG wiki](https://github.com/synthetos/TinyG/wiki) for documentation and user manuals
 
 **IMPORTANT: If you are running a TinyG version 6 or earlier be sure to set the $hv value to 6 after you load version 0.95. 
@@ -34,7 +30,7 @@ This addresses HW changes between the versions.**
 
 Tinyg versions 7 and 8 are electrically the same, and can be set to HW version 8.
 
-The previous master version is 0.95, BUILD 370.01
+The previous master version is 0.96, BUILD 380.08
 
 If you have feature requests or find any bugs please log them in the Issues tab on the github
 
@@ -45,10 +41,8 @@ BRANCHES
 
 * MASTER is the current production code. This is not updated very frequently.
 * EDGE branch is thought to be relatively stable, but has not received enough testing to be promoted to master.
-* DEV is work in process and generally not a good idea to use. Use code from dev only if specifically directed there.
-=======
+* DEV is work in process and generally not a good idea to use. Use code from dev only if specifically directed there.
 [![Build Status](https://travis-ci.org/synthetos/TinyG.svg)](https://travis-ci.org/synthetos/TinyG)
 
 The edge branch is the work-in-process for the next stable release. Depending on the velocity of changes it's somewhere between alpha and beta. 
 An attempt is made to keep everything working and usable, but there are no guarantees. Generally speaking, the edge branch should not be used for production uses - use the master branch instead.
->>>>>>> refs/heads/edge