working on update and home page
merged branch master