notendasaga2 merged við master