Assignment as I left it on friday halloween. Changes saved before starting today
Merge https://github.com/philtremblay/comp310