erica's revisions
Merge branch 'ericas-revisions'
merge erica's changes, fix colors on index, add clymb and engine yard