Integration!
Merge branch 'master' of
https://github.com/DePauwREU2013/Scales-ScalaJS.git

Conflicts:
	src/main/scala/edu/depauw/scales/reactive/Keyboard.scala