Initial commit
Merge commit '8198247cdc37ecfcd651d430517f882db9b70125'

Conflicts:
	.gitignore