Solid-ish
Merge branch 'master' of https://github.com/Farm8763/Flying-Beaver.git

Conflicts:
	N64Controller/src/local/hackathon/n64controller/JoyStick.java
Merge branch 'master' of https://github.com/Farm8763/Flying-Beaver.git
jklasd