add checkin button
Merge branch 'luke-2'