My initial commit
Merge commit '4ef050c542632283aa82bb912a2aca1ec5526858'

Conflicts:
	LICENSE
	README.md