readme test
small bug fixes
merge conflict fix
Merge branch 'belindahare-master'
merge conflict fix
Merge pull request #25 from belindahare/master

small bug fixes