From 86166472eb61ad1062cfc07a6b0216401e4c0a08 Mon Sep 17 00:00:00 2001
From: Rafa Paradela <rafa.p@47deg.com>
Date: Thu, 12 May 2016 18:44:18 +0200
Subject: [PATCH] Resolves conflicts after master merging

---
 CHANGELOG.md | 18 ++++++++++++++++--
 build.sbt    |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1996328f..cd9e4baac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,20 @@
 Changelog
 =============
 
-## 2016/05/11 - Version 0.1
+## 2016/05/12 - Version 0.1
 
-- First version
\ No newline at end of file
+This first approach includes several functions related to Users, Repositories and Authentication process.
+
+- Users:
+	- Get user
+	- Get authenticated user
+	- Get users
+
+- Repositories:
+	- Get repository
+	- List commits
+
+- Authentication:
+	- New authorization
+	- Get authorize url (oAuth step 1)
+	- Get access token (oAuth step 2)
\ No newline at end of file
diff --git a/build.sbt b/build.sbt
index 62f251117..69d5bd2a0 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2,7 +2,7 @@ organization := "com.fortysevendeg"
 
 name := "github4s"
 
-version := "0.1"
+version := "0.2-SNAPSHOT"
 
 scalaVersion := "2.11.8"