new feature in development
some changes
Merge branch 'staging' into development

Conflicts:
	README.md
Merge pull request #3 from mgardellini/development

Development