Merge pull request #4 from CMPUT301F14T03/master

updating fork
Merge pull request #77 from tbrockman/master

Merge pull request #4 from CMPUT301F14T03/master