adding strikethrough to completed items in todo list
fixing merge conflicts