Resolve gemfile conflict
Resolve gemfile conflict

erictflores/waitless,jchang2014/waitless,erictflores/waitless,erictflores/waitless,jengjao515/WaitLess,jengjao515/WaitLess,jengjao515/WaitLess,jchang2014/waitless,jchang2014/waitless