add hi-router
add hi-router
Merge branch 'ui-router' of https://github.com/bsnyder/sushi into ui-router

Conflicts:
	app/js/controllers.js