initial commit
Merge commit '02b3a8e23fb4dc098b6cb979da1bd3cd841f66a7'

Conflicts:
	.gitignore
	README.md