Base_model Update
Merge branch 'master' of github.com:CaptainFalcon92/Shuttle_Scratch
Base_Model Updated
Merge branch 'master' of github.com:CaptainFalcon92/Shuttle_Scratch

Conflicts:
	model/BaseModel.php
Updated Base_model
Two files a were have modified : Base_Model and ProjectsModel
Merge pull request #7 from Shazey9194/master

Base_Model Updated