front js + css
front
Merge branch 'master' of github.com:CaptainFalcon92/insta-voyage

Conflicts:
	assets/css/main.css
	assets/js/main.js
	index.php