initial commit
Merge commit '0b70c5e149aa996fea62550237a2ce862d3211ac'

Conflicts:
	.gitignore