merging
merging
Merge branch 'master' of github.com:mburke13/mechanical-vibrations
Merging, moved to jquery 1.11.0
Merging with master