createPages commit1
createPages commit2
createPages commit3
commit 4 to branch master
commit 5 to branch master
Merge branch 'createPages'

Conflicts:
	testStuff.txt