fixed a scoping problem
Merge branch 'master' of https://github.com/DePauwREU2013/Scales-ScalaJS