mapping
routes file
conflict resolve
cancancan added
Merge branch 'master', remote-tracking branch 'origin'
pending
attendance_date string to date