Merges master's simulator.tex