Added class 16
Removed junk solution that doesn't actually do anything
Removed junk controllers
Removed old slide
Merge remote-tracking branch 'origin/master'