adding home page
fixed merge changes