A couple of test files
README's are good
gitignores are good
first html doc commit
Merge branch 'refs/heads/gh-pages' into GitHub-Published
this doesn't belong here
changes for testing pushing to orphan branch
Merge branch 'refs/heads/Pixar-Dev' into public-OSS

Conflicts:
	README.md
	file1.txt
	file2.txt