yay merge conflicts
Merge branch 'dev-gradle' of github.com:JustDuckItAll/wpi-suite into dev-gradle

Conflicts:
	Core/WPISuite/README.txt
Merge branch 'dev-gradle' of github.com:JustDuckItAll/wpi-suite into dev-gradle