<<<<<<< HEAD Lathe-3D Frontend interactive client for the simulator Team John Sullivan, Junfei Yu, Tao Wang, Yuteng Mei ||||||| merged common ancestors UI-Design Working on a UI design which could incorporate the video, the 3d model "playground" and the console d5ec0daef60781c275d0d71fe7ce072db49766cf