Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
added springy physics to constellations
Merge branch 'gh-pages'

Conflicts:
	app/GianaFactory.js