initial commit
adding to readme.md
merged readme
fixed merge conflict on README
Merge branch 'jamie'
merge ross