conflicts stuff
Merge branch 'master' of https://github.com/sjgeorge2/Assembly-Project-2
Merge branch 'master' of https://github.com/sjgeorge2/Assembly-Project-2
Fixed some oopsies (private members need a function so that they can be set or accessed by non-member functions)

Bug: Helicopter continues to move up after first mouse click