Removed class names and scope resolution operators. Removed space between
includes in both cpps.
Joystick buttons as buttons and joystick axes as buttons added to input
system.