epic fix pack 2
Merge branch 'master' of github.com:gyzerok/Cron

Conflicts:
	www/css/style.css