Merge pull request #2 from ablackm/branch2

commiting branch 2
bug fix emergneyc comit
new fiile
Merge branch 'branch2' into bugfix-emergency

Conflicts:
	README.md