just update
Merge branch 'master' of C:/Users/agr/Documents/GitHub/Cron

Conflicts:
	src/Cron/CronBundle/Resources/views/Main/disk.html.twig
Merge branch 'master' of C:/Users/agr/Documents/GitHub/Cron
update
tiny fix