get rid of turbolinks and add pry
Merge branch 'master' into add-devise

* master:
  get rid of turbolinks and add pry