code pdo
maj
update
Merge branch 'master' of github.com:CaptainFalcon92/insta-voyage

Conflicts:
	assets/css/main.css
	config/database.xml
	config/routes.xml
	controller/DefaultController.php
	controller/TripController.php
	model/BaseModel.php
	model/TripModel.php
	view/admin/template.php
	view/default/contact.php
	view/includes/navbar.php
	view/template.php
Merge pull request #8 from Alex237/master

Ajax tryout
forfaits
Merge branch 'master' of github.com:CaptainFalcon92/insta-voyage

Conflicts:
	assets/css/main.css
	controller/DefaultController.php
	controller/TripController.php
	view/default/contact.php
	view/includes/navbar.php
	view/template.php
Merge pull request #9 from ludyss/master

gestion de formules
js workout
Merge branch 'master' of github.com:CaptainFalcon92/insta-voyage

Conflicts:
	assets/css/main.css
	view/default/contact.php
	view/includes/navbar.php
	view/template.php