conflict resolv
Merge branch 'master' of https://github.com/nicedude/N64_Controller_Wireless_Rumble