Initial commit
Merge commit '6004a7c72874571e6c65509b8ad67085a9fbb36e'

Conflicts:
	.gitignore
	README.md