Base model
Merge branch 'master' of github.com:CaptainFalcon92/Shuttle_Scratch

Conflicts:
	model/BaseModel.php
Merge branch 'master' of github.com:CaptainFalcon92/Shuttle_Scratch
First commit
Merge pull request #2 from Alex237/view_dev

Views
wip
Merge branch 'master' of github.com:CaptainFalcon92/Shuttle_Scratch

Conflicts:
	config/routes.xml
base model modifier
Merge branch 'master' of github.com:CaptainFalcon92/Shuttle_Scratch
Merge pull request #3 from Shazey9194/master

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

base_Model Update2
Base_model Update
Merge branch 'master' of github.com:CaptainFalcon92/Shuttle_Scratch
Base_Model Updated
Singletons and form validation overhaul
Merge branch 'master' of github.com:CaptainFalcon92/Shuttle_Scratch

Conflicts:
	model/BaseModel.php
Sauvegarde base model