Somme design workout
Merge branch 'master' of github.com:CaptainFalcon92/insta-voyage
js workout
Merge pull request #9 from ludyss/master

gestion de formules
js workout
Merge branch 'master' of github.com:CaptainFalcon92/insta-voyage

Conflicts:
	assets/css/main.css
	view/default/contact.php
	view/includes/navbar.php
	view/template.php
Merge pull request #10 from Alex237/master

Design update
fix css bug
Merge pull request #11 from Alex237/master

fix css bug