updates to file
Merge branch 'master' of github.com:kthyng/time_res