temp
Merge branch 'master' of github.com:CaptainFalcon92/insta-voyage
temp
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