ctb/cse491-mergez — pull request #12 by xavierdhjr (2014-04-17 19:50:25+00:00)
Title: In Class Pull Request

please merge my changes