master test
master test
branch2 test
branch2 test2
Merge branch 'branch2' of https://github.com/scpenland/rebase-test into branch2

* 'branch2' of https://github.com/scpenland/rebase-test:
  branch2 test2
  branch2 test

Conflicts:
	test2.html