Fix some bug
Merge branch 'master' of github.com:CaptainFalcon92/insta-voyage
trip previews front
somme stuff
yeah
Update some design stuff
separated stylesheets
Merge pull request #6 from Alex237/master

add design elements
Merge branch 'master' of github.com:CaptainFalcon92/insta-voyage

Conflicts:
	assets/css/main.css
	config/routes.xml
	view/template.php
merge
models
nfzajfjafieng
texte
add link to navbar
Merge branch 'master' of github.com:CaptainFalcon92/insta-voyage
model demo
contact design
Merge branch 'master' of github.com:CaptainFalcon92/insta-voyage
Merge pull request #7 from Alex237/master

Styling contact page
back office alpha