modifiche cap 5 e 6 st
Merge branch 'master' of github.com:ClockWorkTeam/ClockWork