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

Conflicts:
	assets/css/main.css
	config/routes.xml
	view/template.php
merge