Did stuff to biggie.
Added feature 4a
Added feature 5.
Added feature 6
Added feature 7
Added feature 4b
Merge branch 'develop' into feature/foo

Conflicts:
	README.md