Started on correct button
Merge branch 'master' of https://github.com/danielrasmuson/Math130_Automated