checkin button
fixed merge problems...i think
Merge pull request #8 from gkadillak/robert-feature

Robert feature fix