CSc436/Project-4x — pull request #33 by whitely (2014-04-23 01:31:15+00:00)
Title: Merge Alex's code

Has to be manually done because there are changes to stuff that could introduce errors.