added home page
conflit resolved