Merge pull request #41 from rhololkeolke/master

Final tweaks from me
Merge pull request #43 from rhololkeolke/master

Build for Class Presentation