initial
Merge branch 'master' into origin

Conflicts:
	.gitignore