Added lunch cards to scout information
Fixed merge conflict
Merge branch 'gmcquie-master'