Merge pull request #214 from insertinterestingnamehere/typos

revision of OOP lab
Merge pull request #215 from insertinterestingnamehere/typos

Restructured the optimization labs.