initial commit
Merge commit 'a590303a924e99c6c0428c75c3bfc892161aaa41'

Conflicts:
	.gitignore