20140604 - Initial Upload

Version submitted for grading.
Merge branch 'master' of https://github.com/logicaMachina/CPSC2108-Assgn2