updated w/ hash singleton
Merge branch 'master' of github.com:Auriculaire/Ballistic-Bulbasaur