Finished Shunting Yard Temp

Begin merging temp with the real file