proctopj/CSE381 — pull request #1 by proctopj (2014-06-30 15:02:12+00:00)
Title: Trying to pull Naoki's Changes

Here goes nothing