Merge pull request #1 from HHS-Programming-in-Action/master

Fix calculation of damping components. From Mr. Dennison.
isolated weight from mass
Merge branch 'master' of https://github.com/ldanilek/PhysicsLabs

Conflicts:
	Bridge/bridgeBuilder.js
Merge errors, UI

Are you sure these equations are right? It looks like the same problems
(objects don’t fall) are still in effect, although that might be due to
a decrease in dt.
Merge branch 'upstream/master'