Layout and content changed.
Merge branch 'master' of github.com:MOctavio/rails-api