a few updates

Getting a little more grasp on Jekyll
update
Merge branch 'master' into staging
Fix issue with git
Merge branch 'master' into staging

Conflicts:
	index.html
test
Merge pull request #5 from antoniolocandro/development

New branch used