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
Changed a lot of files, opening a new branch in case there are things broken as a result.
Merge pull request #147 from tbrockman/dev

Creating dev branch in case I broke something