Revert ""

This reverts commit 6a191b546c623805a6a99f1efca80042ce56a517.
Merge origin/master

Conflicts:
	src/edu/wpi/first/wpilibj/paradigm/AdventureRick.java
Merge origin/master

Conflicts:
	src/edu/wpi/first/wpilibj/paradigm/AdventureRick.java
Merge origin/master

Conflicts:
	src/edu/wpi/first/wpilibj/paradigm/AdventureRick.java
Merge origin/master

Conflicts:
	src/edu/wpi/first/wpilibj/paradigm/AdventureRick.java