Merge pull request #24 from belindahare/master

corrected merge errors in index.html.haml and workspace.xml files