Hugos 2d query
Merge https://github.com/bcouston/COM2002-Assignment-2