Merge branch 'master' of https://github.com/vHack-API/vHackAPI-Java

angelbirth · angelbirth · commit a8a8f5640379 · 2016-09-02T17:11:31.000+07:00
update from mainstream
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1 @@
+language: java
diff --git a/README.md b/README.md
@@ -1,4 +1,6 @@
 # vHackAPI-Java
+[![Gitter Chat](https://badges.gitter.im/owner/repo.png)](https://gitter.im/vHack-API/vHackAPI-Java) [![Build Status](https://travis-ci.org/vHack-API/vHackAPI-Java.svg?branch=master)](https://travis-ci.org/vHack-API/vHackAPI-Java)
+
 Current feature list:
 - Ability to scan the network for IP addresses.
 - Scan IP addresses for stats.
