Merge branch 'refactoring'

Conflicts:
	.gitignore