Cross out second step
Merge and fix conflict

Conflicts:
	README.md