From b77c7e900128962f95c20a7e41ac2cf08da59ab7 Mon Sep 17 00:00:00 2001
From: Vincent Yang <VincentYang2014@gmail.com>
Date: Sun, 10 Jul 2016 22:47:58 -0700
Subject: [PATCH 1/4] mismanaged merge

---
 app.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app.py b/app.py
index 980e442..911d278 100644
--- a/app.py
+++ b/app.py
@@ -108,9 +108,6 @@ def process_request():
                 message = new_line.join(total)
         else:
             message = "Incomplete request; more information needed."
-
-        else:
-            message = "Incomplete request; more information needed."
     except:
         message = "Sorry, there was an error."
 

From 55420b53b89c6ca4577a2dac6def2753bfbb7f61 Mon Sep 17 00:00:00 2001
From: Vincent Yang <VincentYang2014@gmail.com>
Date: Sun, 10 Jul 2016 23:47:58 -0700
Subject: [PATCH 2/4] updated required packages for heroku

---
 README.md        | 3 ---
 requirements.txt | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 0a25147..bf725d2 100644
--- a/README.md
+++ b/README.md
@@ -15,9 +15,6 @@ As such, there are two main features to this program:
 2. Randomly choose an option to combat group indecision when choosing a place to go
 
 ####Usage Instructions
-During development, only verified numbers can receive messages. These can be checked and modified [here](https://www.twilio.com/user/account/phone-numbers/verified). 
-Further information can be found [here](https://www.twilio.com/user/account/log/notifications).
-
 Currently, verified numbers can message `+16503977854` via. SMS. If the message is from a registered number, the response will greet by name. 
 Text `usage` to `+16503977854` to see how to use the application. 
 
diff --git a/requirements.txt b/requirements.txt
index 203a317..341093c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,3 +5,4 @@ gunicorn==19.6.0
 Flask==0.11.1
 twilio==5.4.0
 yelp==1.0.2
+nose==1.3.7

From a7d6710f742ad00d5d0fef1bed6c5194d97287fc Mon Sep 17 00:00:00 2001
From: Vincent Yang <VincentYang2014@gmail.com>
Date: Sun, 10 Jul 2016 23:52:49 -0700
Subject: [PATCH 3/4] edit procfile updated filename

---
 .travis.yml | 2 +-
 Procfile    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f604d24..1a3e0a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,5 +11,5 @@ deploy:
   on:
     repo: YangVincent/yelp-and-chill
     branch: vincent
-  run: "web: gunicorn run:app --log-file -"
+  run: "web: gunicorn app:app --log-file -"
 
diff --git a/Procfile b/Procfile
index a1d71f3..997bb9f 100644
--- a/Procfile
+++ b/Procfile
@@ -1 +1 @@
-web: gunicorn run:app --log-file -
+web: gunicorn app:app --log-file -

From bd126510bb56a3c1693363d7be36e552229f9fac Mon Sep 17 00:00:00 2001
From: Vincent Yang <VincentYang2014@gmail.com>
Date: Mon, 11 Jul 2016 00:14:52 -0700
Subject: [PATCH 4/4] updated procfile

---
 .travis.yml                 | 2 +-
 Procfile                    | 2 +-
 test_app.py                 | 2 +-
 app.py => yelp_and_chill.py | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename app.py => yelp_and_chill.py (100%)

diff --git a/.travis.yml b/.travis.yml
index 1a3e0a7..9f8aec7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,5 +11,5 @@ deploy:
   on:
     repo: YangVincent/yelp-and-chill
     branch: vincent
-  run: "web: gunicorn app:app --log-file -"
+  run: "web: gunicorn yelp-and-chill:app --log-file -"
 
diff --git a/Procfile b/Procfile
index 997bb9f..015c6fb 100644
--- a/Procfile
+++ b/Procfile
@@ -1 +1 @@
-web: gunicorn app:app --log-file -
+web: gunicorn yelp_and_chill:app --log-file -
diff --git a/test_app.py b/test_app.py
index 7df33f9..7201af0 100644
--- a/test_app.py
+++ b/test_app.py
@@ -1,5 +1,5 @@
 import unittest
-from app import app
+from yelp_and_chill import app
 
 class TestYelpAndChill(unittest.TestCase):
     def test_yelp_and_chill(self):
diff --git a/app.py b/yelp_and_chill.py
similarity index 100%
rename from app.py
rename to yelp_and_chill.py