Initial commit
Merge for push

Conflicts:
	README.md