Life Or -> Life Orb
Merge branch 'master' of github.com:smogon/scms