Merge pull request #13 from Alex237/master

Workout improvement
temp
Merge branch 'master' of github.com:CaptainFalcon92/insta-voyage
formula redux
Improve reservation workout
Merge branch 'master' of github.com:CaptainFalcon92/insta-voyage

Conflicts:
	controller/TripController.php
	model/FormulaModel.php