backbone routing test
Merge branch 'scale' into router

Conflicts:
	coffee/src/controllers/main_controller.coffee
	gulpfile.js
	js/application.js
	js/tests.js
backbone navigation