Testing Development Branch
Merge branch 'development' of https://github.com/cvquesty/samplerepo into development

Conflicts:
	README.md
development branch