small modifications to home page
fixed merge conflict