Skeleton for test case for merge languages
Added Pry to Rails
Added Pry to Rails
Update spec to match new masthead search
Implemented data model for merging languages
Changed class method to instance method
Controller action for merge
Removed iOS hack
Router, controller actions and views for merging languages
Test cases for Languages
Bug fix
Style adjustments
Merge branch 'master' into skill_lang
Test cases for merging skills
Model implementation for merge skills
Form for merging skills
Routes for merging skills
Link to merge skills form
Feature tests for merging skills
Bug fixes