WIP
Merge branch 'wip'

Conflicts:
	.gitignore