Merge branch 'xurui'
Created front-end adding of tasks
Merge branch 'master' of github.com:u-jo/cally into calendarView
Can calculate times
merge branch