Boo
More text [fixes #15]
Merge pull request #16 from pivotal-cf-experimental/another_branch

Another branch
[fixes #18]
Merge pull request #19 from pivotal-cf-experimental/much_branch

[fixes #18]
Merge branch 'master' into other_branch

Conflicts:
	README