Super shit
Merge commit '93870f1f8c4fe3f4704b8c621be445bda457588b'

Conflicts:
	N64Controller/bin/classes/local/hackathon/n64controller/MainActivity.class
	N64Controller/bin/classes/local/hackathon/n64controller/R$id.class
	N64Controller/bin/classes/local/hackathon/n64controller/R$layout.class
	N64Controller/bin/classes/local/hackathon/n64controller/R$menu.class
	N64Controller/bin/classes/local/hackathon/n64controller/R$string.class
	N64Controller/bin/classes/local/hackathon/n64controller/R$style.class
	N64Controller/bin/classes/local/hackathon/n64controller/R$xml.class
	N64Controller/gen/local/hackathon/n64controller/R.java
	N64Controller/src/local/hackathon/n64controller/MainActivity.java
Merge branch 'master' of https://github.com/Farm8763/Flying-Beaver