just an update
i don't know what i'm doing right now
Merge branch 'master' of https://github.com/nscipione/nscipione

Conflicts:
	_config.yml