ADDED delete current user, ADDED destroy fuction to user controller and tests
UPDATED apprenticeship/show view
ADDED apprenticeship/new json rabl and test cases
ADDED skills json and test cases
ADDED messages json and test cases
ADDED ratings json and test cases
UPDATED conversation json and test cases
REMOVED sort! from messages/index json
UPDATED user/show json
UPDATED proficiencies/show json
UPDATED db/seeds
ADDED proficiencies index json and test cases
UPDATED api root
Merge branch 'delete_user' of github.com:Simon245/grasshopper into Simon245-delete_user

RESOLVED conflicts in routes.rb
Merge pull request #28 from josephktcheung/API

Api