Initial commit
Merge remote-tracking branch 'origin' into v0.1

Conflicts:
	.gitignore