fixed logic bugs
Merge branch 'master' of https://github.com/aclevine/136_timesheet