Initial import.
Merge remote-tracking branch 'remotes/github/master'

Conflicts:
	.gitignore