Merge branch 'master' into front-end
Add pry-rails
Merge branch 'front-end' of https://github.com/dlachasse/tidal.io into front-end