Finished Assignment 12

Forgot to commit changes, and finalization of assignment 12.
Merge pull request #20 from JeffScaturro/Desktop

Finished Assignment 12