Starter code
Merge https://github.com/g0tsimid/csc418-a2
Merged with github