Merge branch 'master' of github.com:smogon/scms
Merge branch 'master' of github.com:smogon/scms
PS Rooms Update

Added shaymin and Zodiax.
PS Staff List Update

Changed link formatting.
Merge pull request #611 from smogon/06976eae09e5a46edcd6d85d60ff1dbe

PS Staff List Update - use relative links