minor css change (height)
switching to laptop
Merge branch 'animations' of https://github.com/VT-CHCI/SoundOfFractions into animations

Conflicts:
	app/assets/javascripts/backbone/views/measure/measureRepView.js
	app/assets/javascripts/backbone/views/stage/stageView.js