Merge pull request #82 from KirbyAu2/refactorAndConfettiFix

Bug fixes and fixes to Anthony's changes
added in joystick API
Added in joystick functionality