Force clonfict
Resolved conflict with line 25

I edited line 23 but someone else removed it and added a new line below
it

The solution was to keep both lines in the order that they were changed

Conflicts:
	README.md