initial commit
Initial commit

Conflicts:
	.gitignore
	README.md