CMPUT301F13T02/301project — pull request #4 by moorej12 (2013-09-26 01:45:12+00:00)
Title: This is James' commit

Please pull