Fix spinout issue
Merge branch 'Project-1' of github.com:destroyhimmyrobots/coms4733 into Project-1