punch in / punch out functions correctly
Merge pull request #15 from msmith7904/punch_in_punch_out

punch in / punch out functions correctly