Tag Cloud
Merge branch 'master' of https://github.com/pinya/ttt

Conflicts:
	app/assets/stylesheets/staffs.css.sass
	app/views/partials/_bottom_bar.html.slim
	app/views/partials/_top_bar.html.slim