Updating settings file
Merge branch 'master' of https://github.com/UCSD-TIES/ckprosecution
Merge branch 'master' of https://github.com/UCSD-TIES/ckprosecution
Merge branch 'master' of https://github.com/UCSD-TIES/ckprosecution
Updating update time to be automatically set