From da910e536ba58aacf0dd503ca3bb0309750182db Mon Sep 17 00:00:00 2001
From: "Daniel St. Jules" <danielst.jules@gmail.com>
Date: Sun, 28 Dec 2014 14:10:03 -0800
Subject: [PATCH] 1.1.0

---
 CHANGELOG.md            | 12 ++++++++++++
 README.md               |  6 ++++--
 src/Console/Console.php |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 380ff14..7b79841 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+### 1.1.0 (2014-12-28)
+
+  * toContain/notToContain accepts multiple args
+  * Added toContainAnyOf
+  * Added support for custom matchers
+  * Support phar generation
+  * Support for pending specs via xdescribe, xcontext, and xit
+  * Improved watcher, with inotify support
+  * Support the use of custom reporters
+  * Added support for a bootstrap file to be loaded before running suites
+  * Added --no-color option
+
 ### 1.0.0 (2013-12-07)
 
   * Initial Stable Release
diff --git a/README.md b/README.md
index bd6de4b..81569ef 100644
--- a/README.md
+++ b/README.md
@@ -55,8 +55,10 @@ Options
 
 ## Writing Specs
 
-Pho exposes 8 functions for organizing and writing your tests: `describe`,
-`context`, `it`, `before`, `after`, `beforeEach`, `afterEach` and `expect`.
+Pho exposes a DSL for organizing and writing your tests, which includes the
+following functions: `describe`, `context`, `it`, `before`, `after`, `beforeEach`,
+`afterEach` and `expect`. Equivalent functions for disabling specs and suites
+also exist via `xdescribe`, `xcontext` and `xit`.
 
 To create a suite, `describe` and `context` can be used by passing them a
 string and function. Both are interchangeable, though context is more often
diff --git a/src/Console/Console.php b/src/Console/Console.php
index 717403a..3d29afa 100644
--- a/src/Console/Console.php
+++ b/src/Console/Console.php
@@ -9,7 +9,7 @@
 
 class Console
 {
-    const VERSION = '1.0.0';
+    const VERSION = '1.1.0';
 
     const DEFAULT_REPORTER = 'pho\\Reporter\\DotReporter';