initial commit
Merge commit 'baa60cc5e9caa914d39edd1d3a5fda4570c7ad53'

Conflicts:
	.gitignore
	README.md