whitespace changes
speed improvements drawing the stress test
merge conflict
Merge branch 'gh-pages'