merge lines
print test output to document instead of console so we can test easily on mobile devices
Merge branch 'master' into gh-pages