Attendace model added along with css
gemfile conflict removed