Initial commit
Merge conflicts resolved

Conflicts:
	README.md