fix conflict on gemfile
Merge branch 'master' of https://github.com/infecto/autism-dates
fix gemfile.lock