HW2 Fixes
Merge pull request #1 from cis197f14/hw2Fixes

HW2 Fixes