First Commit
Fixed merge issues between README.md files.

Conflicts:
	README.md