ok
Merge branch 'master' of github.com:jlarusso-canvas/canvas-rails-template