merging upstream

README.md

@@ -3,7 +3,8 @@ hrt-bus-text-my-bus
 ===================
 
 STATUS: pre-alpha need more testing
-phone number: 757-913-5000
+phone number: 757-913-5000  
+
 text to find in realtime when the bus is coming. powered by the hrtb.us api  `
 
 
@@ -20,6 +21,7 @@ development
 ---
 To test locally you DO NOT need to set up twilio. You can install the dependencies and test locally what type of reponse messages are formed from the console.
 
+<<<<<<< HEAD
 The rest will be handled by the third party service
 
 installation
@@ -35,4 +37,9 @@ node app.js
 
 HRT BUS API
 ----
+=======
+![Imgur](http://i.imgur.com/UTX2FUu.png)
+
+
+>>>>>>> 5fc3ed9d5d1ff6db6c0672ba0f1eb6408df79978
 http://api.hrtb.us/api/