changes from branch dev

DigDeeperInsideOurThoughts · DigDeeperInsideOurThoughts · commit a71990c0b482 · 2016-10-31T12:18:20.000+08:00
diff --git a/branchtest/branchtest.txt b/branchtest/branchtest.txt
@@ -1 +1 @@
-This is a master branch commit.
+This is a dev branch commit.

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-This is a master branch commit.`
	`1`	`+This is a dev branch commit.`