My most recent stuff.
Some more changes
Fix some merging errors.
Still trying to fix the merge errors
Fix a thing
Merge branch 'master' of https://github.com/Winston-Chan/CPSC449