Adding in feature 3
Merge branch 'hotfix/hotfix_error_in_readme' into develop
Merge branch 'feature/Feature_three' into develop

Conflicts:
	README.md
no message
Merge branch 'develop'

* develop:
  no message
  Adding in feature 3