experimenting with commit and merge to branch
experimental commit to eb's-branch
Merge branch 'eb's-branch'

* eb's-branch:
  experimental commit to eb's-branch

Conflicts:
	README.md
Merge pull request #1 from ebeshero/master

merge!