added edit task modal
merged
added things
merged tasks html