index
index
Merge branch 'master' of https://github.com/838/etic-portfolio

Conflicts:
	app/config/database.php
	app/routes.php
	app/views/layouts/default.blade.php