chase's changes
Merge branch 'master' of github.com:louisnet/csc448
new stuff