Merge pull request #36 from belindahare/master

corrected merge errors in the layout