blah
Merge branch 'master' of github.com:amagura/zelda-battery