Challenges and Evolution of Combined and Separate Thermodynamics Courses in a Mechanical Engineering and Mechanical Engineering Technology Program