commit 60ee7e4609ba0eda545954046fa11c89c3fdb861
author BroganD1993 <darrenbrogan@hotmail.com> Fri Jun 20 20:33:30 2014 +0100
committer BroganD1993 <darrenbrogan@hotmail.com> Fri Jun 20 20:33:30 2014 +0100
tree cc67d01307b4fac0e1709fcc71fdd41890301cbf
parent f3f68cd146ac3e0691241c8067b2c63094bb35c2
parent 40d7a7de5a1d1c97a1ec98dad80b1b67cb52b303

Merge branch 'master' of github.com:NOPping/gstack into refactor

HISTORY.rst

diff --git a/HISTORY.rst b/HISTORY.rst
index 1dc899a..dd215f0 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -24,4 +24,4 @@
 0.0.1 (24-9-2013)
 __________________
 
-* gcloud onception
+* gcloud conception

README.rst

diff --git a/README.rst b/README.rst
index 53e5405..addd1ef 100644
--- a/README.rst
+++ b/README.rst
@@ -7,9 +7,9 @@
 
 .. image:: https://badge.fury.io/py/gstack.png
        :target: https://pypi.python.org/pypi/gstack
-.. image:: https://api.travis-ci.org/NOPping/gstack.png
+.. image:: https://api.travis-ci.org/NOPping/gstack.png?branch=master
        :target: https://travis-ci.org/NOPping/gstack
-.. image:: https://coveralls.io/repos/NOPping/gstack/badge.png
+.. image:: https://coveralls.io/repos/NOPping/gstack/badge.png?branch=master
        :target: https://coveralls.io/r/NOPping/gstack