some stuff
Merge branch 'master' of github.com:CaptainFalcon92/insta-voyage
Ajax tryout
trip step pictures and cover
Merge pull request #8 from Alex237/master

Ajax tryout
Merge branch 'master' of github.com:CaptainFalcon92/insta-voyage

Conflicts:
	assets/css/main.css
	controller/DefaultController.php
	controller/TripController.php
	view/default/contact.php
	view/includes/navbar.php
	view/template.php