Home page layout
readme conflict fixed