From 40f0fb569e24e8e90a47f40cd23b11c93a439984 Mon Sep 17 00:00:00 2001
From: Zach Klippenstein <zachklipp@squareup.com>
Date: Fri, 17 Apr 2015 14:30:19 -0700
Subject: [PATCH] Added changelog to prep for 1.1.0 release, added badges to
 README.

---
 CHANGELOG.md | 14 ++++++++++++++
 README.md    |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..e97f7e1
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,14 @@
+Change Log
+==========
+
+## Version 1.1.0
+
+_2015-04-17_
+
+ *  ListPhrase for formatting lists with different sizes with different separators.
+
+## Version 1.0.3
+
+_2014-01-21_
+
+Initial release.
diff --git a/README.md b/README.md
index 146c7f8..d29f3dd 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 Phrase - Android string formatting
 ==================================
 
+[![license](http://img.shields.io/badge/license-apache_2.0-red.svg?style=flat)](https://raw.githubusercontent.com/square/phrase/master/LICENSE.txt) [![maven](https://img.shields.io/maven-central/v/com.squareup.phrase/phrase.svg)](http://maven-repository.com/artifact/com.squareup.phrase) [![build](https://img.shields.io/travis/square/phrase.svg?style=flat)](https://travis-ci.org/square/phrase)
+
 ```java
 CharSequence formatted = Phrase.from("Hi {first_name}, you are {age} years old.")
   .put("first_name", firstName)