git is awesome
Merge branch 'develop' into feature/readme_changes

* develop:
  some additional changes

Conflicts:
	README.md