assign2 submission for tony chen
Merge pull request #129 from chilldude/master

assign2 submission for tony chen