Reordered function & set y=0
Merge branch 'Project-2' of github.com:destroyhimmyrobots/coms4733 into Project-2