Annotating shots for neon
Merge branch 'master' of https://github.com/jcowles/demo-13

Conflicts:
	js/core.js