Initial commit based on files submitted for iteration  4
Merge https://github.com/zskaik/sysc3303projectr2