Merge branch 'upstream' of github.com:rshadow/asus_oled
fix Makefile
Merge branch 'master' of github.com:rshadow/asus_oled