base_model Update
Merge branch 'master' of github.com:CaptainFalcon92/Shuttle_Scratch
Merge pull request #4 from Shazey9194/master

base_Model Update2