Initial commit
Merge remote-tracking branch 'upstream/master' into gh-pages

Conflicts:
	.gitignore
	README.md