Merge branch 'master' of https://github.com/jrejaud/TwilioLookup

# Conflicts:
#	.gitignore

.gitignore

@@ -20,7 +20,10 @@
 # Generated files
 bin/
 gen/
+<<<<<<< HEAD
 out/
+=======
+>>>>>>> 9388f8405b5df1fef111e33bb060b593172eca3b
 
 # Gradle files
 .gradle/
@@ -40,6 +43,7 @@ proguard/
 
 # Android Studio captures folder
 captures/
+<<<<<<< HEAD
 
 # Intellij
 *.iml

LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Jordan Réjaud
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -0,0 +1,32 @@
+# TwilioLookup
+Android wrapper for Twilio's Phone Lookup API
+
+Simple Android wrapper for [Twilio's Phone Lookup](https://www.twilio.com/lookup)
+
+Example
+===
+```
+TwilioLookup.setAuthorization("yourTwilioAccountSid", "yourTwilioAuthToken");
+
+TwilioLookup.lookup("theNumberYouWantToLookup", new TwilioLookup.OnResponseCallback() {
+    @Override
+    public void onValidResponse(TwilioLookupResponse response) {
+        Log.d("TAG","Success, country code: "+response.getCountryCode()+" "+response.getCarrier().getName());
+    }
+
+    @Override
+    public void onInvalidResponse(Response response) {
+        Log.d("TAG","Failure, phone number is not valid, "+response.message());
+     }
+
+     @Override
+    public void onFailure(Throwable throwable) {
+        Log.e("TAG", "Error: " + throwable.toString());
+    }
+});
+```
+
+
+Installation
+===
+