Matt's edits
Merge branch 'master' of https://github.com/erikwaing/threes

Conflicts:
	threespaper.tex