Merge pull request #51 from ryanadair009/master

Boggy Augie
cast changes
Merge branch 'master' of https://github.com/dranelol/CMPS427
asd
chaos explosion done
Merge remote-tracking branch 'upstream/master'