COMMIT FROM GABE .COM
Merge branch 'master' of https://github.com/gabriel3000/portfolio

Conflicts:
	templates/layouts/default.html