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

Conflicts:
	app/controllers/HomeController.php

commit
commit