Initial Commit of existing probem
Merge branch 'master' into development

Conflicts:
	README.md
fixing another conflict