Resolve merge conflict

Changed settings

Changed xbox and playstation button mappings, removed dead code

Added settings file

Added file association

Added drive train ramp to control acceleration/deceleration

Added gradlew.bat to enable windows builds

Updated gitignore

Updated Phoenix CTRE library

Slowed intake speed from 100% to 50%, increased output speed from 30% to 50%

Updated build file to version 14 (2019.4.1)

Inverted intake/output motor because motors weren't synched

Slowed down output speed

Updated gitignore to ignore build products

Removed solenoid disable blocks and Stronghold motor settings