Merge pull request #2 from antoniolocandro/staging

dirty method to fix jekyll directory
Few contact changes
fixed urls
Merge branch 'master' into staging

Conflicts:
	index.html
test