Use dashboard.hiccup template
Merge branch 'master' of github.com:8thlight/dojo-dashboard

Conflicts:
	spec/clj/dojo_dashboard/core_spec.clj
	src/clj/dojo_dashboard/core.clj