so much random stuff her, but whatever
Merge branch 'master' of https://github.com/kmacdonald/Senior_Project
wait what