remove bootstrap-rails datepicker from gemfile. Was throwing and error and no longer in use.
Merge branch 'master' of https://github.com/epicodus/chicktech

I had made one small change on master so this merge will get it all up to date.