merging
merging
Merge branch 'master' of github.com:mburke13/mechanical-vibrations
Merging, moved to jquery 1.11.0
Merging with master
Add bootstrap form control formatting
Merge branch 'master' of github.com:mburke13/mechanical-vibrations
Added chart axis labels and title
Add acceleration and velocity vectors
Merge with master
Merge branch 'master' of github.com:mburke13/mechanical-vibrations into gh-pages