Merge remote-tracking branch 'remotes/origin/1.0.0' into brandon-gitignore

Conflicts:
	README.md