Updating README

Attempting to create a conflict
Solving conflict by merging branch 'master' of https://github.com/oriblam/EGC

Conflicts:
	README.txt