make 1- and 2- roads intersection permanent green
Merge branch 'master' into gh-pages

Conflicts:
	coffee/model/intersection.coffee
	dist/main.js