edited README hoho
Merge branch 'yohanBranch'

Conflicts:
	README