Add cache timeouts for files
t push
git pull
:w
Merge branch 'master' of github.com:Pezmc/CS-Timetable-to-iCal
Merge branch 'master' of github.com:Pezmc/CS-Timetable-to-iCal
Merge branch 'master' of github.com:Pezmc/CS-Timetable-to-iCal
Merge branch 'master' of github.com:Pezmc/CS-Timetable-to-iCal
Merge branch 'master' of github.com:Pezmc/CS-Timetable-to-iCal
Collision merge