workspace.xml merge error fix
merge error corrections to index and workspace.xml files
Merge pull request #24 from belindahare/master

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