Control choices
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/org/frogforce503/FRCSIM/Main.java
Merge branch 'master' of https://github.com/Suhasy/FRCSIM