Removed color attr.
Removed lingering merge conflict message.
Added missing closing div tag.
Moved around divs to be in the right order. Added documentation.
Added some homepage styles to make page full-width.
Merge branch 'master' of git://github.com/johnshopkins/machado