js code
Merge branch 'master' of github.com:staticshowdown/ss14-team-174