Improve reservation workout
Merge branch 'master' of github.com:CaptainFalcon92/insta-voyage

Conflicts:
	controller/TripController.php
	model/FormulaModel.php
Merge pull request #14 from Alex237/master

Merge