don't use obe script
Merge branch 'master' of github.com:medined/pokemon
Merge branch 'master' of github.com:medined/pokemon
update