Merge pull request #10 from CMPUT301F14T03/master

updating fork
Merge pull request #11 from CMPUT301F14T03/master

updatefork
Merge pull request #12 from CMPUT301F14T03/master

asdfasfgasfgas
Merge branch 'master' of https://github.com/tbrockman/lotsofcodingkitty
test compile again