merge
Merge branch 'master' of github.com:mburke13/mechanical-vibrations
implemented basic functionality, still working on timing