merge commit to master from integrationtests

tabrotest · tabrotest · commit 189f9377c740 · 2015-01-31T22:43:43.000+01:00
diff --git a/README.md b/README.md
@@ -1 +1 @@
-Hello World! I want to be overwritten by featurebranch!
+I am overwriting this blob with something new

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Hello World! I want to be overwritten by featurebranch!`
	`1`	`+I am overwriting this blob with something new`