First commit.
Merge remote-tracking branch 'github/master' into 0.0.1

Conflicts:
	.gitignore