Merge branch 'set-viewport-size'
Merge remote-tracking branch 'origin/fix-up-package-json'

Conflicts:
	package.json