commit before pull
resolved merge conflict
added validation for edit page.Added back to grocerylist button for better UX. added flash messaging in header