Resolved trips issues
Merge branch 'simulator' of https://github.com/szymoniks/COMP3001 into simulator