Merge pull request #9 from kreider1997/master

feature up to date with master
Merge pull request #10 from kreider1997/feature/04--Shake-it-off

Merge pull request #9 from kreider1997/master