Merge branch 'master' of github.com:HubLot/groio

HubLot · HubLot · commit ecd1a8eef055 · 2015-09-10T14:52:48.000+02:00
Conflicts:
	LICENSE
diff --git a/LICENSE b/LICENSE
@@ -19,3 +19,7 @@ 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.
+<<<<<<< HEAD
+=======
+
+>>>>>>> 0d4bedad7194688dfad0dd2eccc822584f5b5303
