Updates README. @wip [f:30m]
Merges Conflicts. [f:5m]
Conflicts:
	README.md