Merge branch 'refs/heads/master' into spock-complete

robfletcher · Jun 8, 2012 · c570e80 · c570e80
2 parents 43324c1 + e9c70ab
commit c570e80
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/readme.md b/readme.md
@@ -0,0 +1,6 @@
+This is a demo application used for delivering a talk on [Spock](http://spockframework.org/) at [gr8conf EU](http://gr8conf.eu/).
+
+The project is structured into three branches:
+- _master_ contains a Java application with JUnit / JMock tests.
+- _spock_ contains barebones Spock specifications used as a starting point for the demo.
+- _spock-complete_ contains fully implemented Spock specifications for reference.