fix up checkins controller
merge
Merge branch 'development' of https://github.com/margaretblue/peekinonme into development