busyness list #KD-5 work 2h
Merge branch 'master' of https://github.com/max-konin/Kogdata
busyness list #KD-5 work 1h
Merge branch 'master' of https://github.com/max-konin/Kogdata

Conflicts:
	app/assets/stylesheets/home.css.scss
	app/views/layouts/calendar.html.haml
	config/routes.rb