minor changes
Merge branch 'staging' of https://github.com/mgardellini/demo-git into staging

Conflicts:
	README.md
Merge pull request #3 from zemariano/staging

minor changes