decor
annotate merge conflict
PlacesController filled
CheckinsController add
merge annotate conflict
Merge branch 'master' of https://github.com/netguru-training/checkinapp