fixed second commit

Conflicts:

	README.md
fifth commit