Merge pull request #2 from CMPUT301F14T03/master

updating my fork
Merge pull request #59 from tbrockman/master

Merge pull request #2 from CMPUT301F14T03/master