merging
Merge branch 'master' of https://github.com/manderelee/csc309
Merge branch 'master' of https://github.com/manderelee/csc309
installing cron and adding krone.js
merging