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

Conflicts:
	config/routes.xml
	controller/DefaultController.php
clean commit