temp
Merge branch 'master' of github.com:CaptainFalcon92/insta-voyage
temp
somme usual stuff
Merge pull request #12 from Alex237/master

some usual work
Merge branch 'master' of github.com:CaptainFalcon92/insta-voyage

Conflicts:
	config/routes.xml
	controller/DefaultController.php
clean commit
somme usual stuff
Merge branch 'master' of github.com:CaptainFalcon92/insta-voyage

Conflicts:
	assets/css/main.css
clean dir
delete somme file
ignore database.xml config
Stanilise current workout
Merge branch 'master' of github.com:CaptainFalcon92/insta-voyage
Improve websit workout
Merge pull request #13 from Alex237/master

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