tedqiao/cs542 — pull request #2 by ycj28c (2014-11-17 20:26:12+00:00)
Title: Merge pull request #2 from tedqiao/master

test