Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/scenes.js
attempt to merge this
Merge pull request #6 from rap/master

FILE PARITY ... AT TANAGRA