Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Adding scoring, throwing targets
merge fix
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
merge with upstream/master
Return the legs to the default position when we stop the script.
Merge branch 'master' of https://github.com/worklist/hifi
Add variable name for throttled frame rate, change to multiple of 60FPS
Merge pull request #2322 from PhilipRosedale/master

Fix magic number in idle FPS, adding skeet to gun.js
Merge pull request #2317 from ey6es/master

Return the legs to the default position when we stop "crazylegs."
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels